summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fastscale/scale.cpp2
-rw-r--r--src/k3b.cpp44
-rw-r--r--src/k3b.h4
-rw-r--r--src/k3bappdevicemanager.cpp2
-rw-r--r--src/k3bapplication.cpp2
-rw-r--r--src/k3baudioplayer.cpp16
-rw-r--r--src/k3bburnprogressdialog.cpp12
-rw-r--r--src/k3bburnprogressdialog.h2
-rw-r--r--src/k3bcontentsview.cpp4
-rw-r--r--src/k3bdataprojectinterface.cpp4
-rw-r--r--src/k3bdataprojectinterface.h2
-rw-r--r--src/k3bdebuggingoutputdialog.cpp22
-rw-r--r--src/k3bdebuggingoutputfile.cpp14
-rw-r--r--src/k3bdirview.cpp18
-rw-r--r--src/k3bdiskinfoview.cpp36
-rw-r--r--src/k3bemptydiscwaiter.cpp84
-rw-r--r--src/k3bfiletreecombobox.cpp22
-rw-r--r--src/k3bfiletreeview.cpp24
-rw-r--r--src/k3bfileview.cpp12
-rw-r--r--src/k3bfirstrun.cpp2
-rw-r--r--src/k3bflatbutton.cpp4
-rw-r--r--src/k3bflatbutton.h2
-rw-r--r--src/k3binteractiondialog.cpp36
-rw-r--r--src/k3binteractiondialog.h2
-rw-r--r--src/k3bjobinterface.cpp2
-rw-r--r--src/k3bjobprogressdialog.cpp62
-rw-r--r--src/k3bjobprogressdialog.h2
-rw-r--r--src/k3blsofwrapperdialog.cpp6
-rw-r--r--src/k3bmediacontentsview.cpp2
-rw-r--r--src/k3bmediaselectioncombobox.cpp14
-rw-r--r--src/k3bmediaselectiondialog.cpp2
-rw-r--r--src/k3bmedium.cpp40
-rw-r--r--src/k3bminibutton.cpp10
-rw-r--r--src/k3bpassivepopup.cpp6
-rw-r--r--src/k3bprojectmanager.cpp18
-rw-r--r--src/k3bsidepanel.cpp8
-rw-r--r--src/k3bsplash.cpp10
-rw-r--r--src/k3bstatusbarmanager.cpp16
-rw-r--r--src/k3bsystemproblemdialog.cpp78
-rw-r--r--src/k3btempdirselectionwidget.cpp10
-rw-r--r--src/k3bthemedheader.cpp20
-rw-r--r--src/k3bthemedheader.h2
-rw-r--r--src/k3btimeoutwidget.cpp8
-rw-r--r--src/k3btimeoutwidget.h4
-rw-r--r--src/k3bwelcomewidget.cpp14
-rw-r--r--src/k3bwelcomewidget.h2
-rw-r--r--src/k3bwidgetshoweffect.cpp2
-rw-r--r--src/k3bwriterselectionwidget.cpp14
-rw-r--r--src/misc/k3bblankingdialog.cpp10
-rw-r--r--src/misc/k3bcdcopydialog.cpp6
-rw-r--r--src/misc/k3bcdimagewritingdialog.cpp64
-rw-r--r--src/misc/k3bdvdcopydialog.cpp4
-rw-r--r--src/misc/k3bdvdformattingdialog.cpp12
-rw-r--r--src/misc/k3bisoimagewritingdialog.cpp30
-rw-r--r--src/option/base_k3bcddboptiontab.ui6
-rw-r--r--src/option/base_k3bmiscoptiontab.ui8
-rw-r--r--src/option/base_k3bpluginoptiontab.ui2
-rw-r--r--src/option/base_k3bthemeoptiontab.ui8
-rw-r--r--src/option/k3bburningoptiontab.cpp10
-rw-r--r--src/option/k3bcddboptiontab.cpp16
-rw-r--r--src/option/k3bdeviceoptiontab.cpp4
-rw-r--r--src/option/k3bdevicewidget.cpp40
-rw-r--r--src/option/k3bexternalbinoptiontab.cpp4
-rw-r--r--src/option/k3bexternalbinwidget.cpp2
-rw-r--r--src/option/k3bmiscoptiontab.cpp6
-rw-r--r--src/option/k3bnotifyoptiontab.cpp2
-rw-r--r--src/option/k3boptiondialog.cpp2
-rw-r--r--src/option/k3bthemeoptiontab.cpp2
-rw-r--r--src/projects/base_k3badvanceddataimagesettings.ui2
-rw-r--r--src/projects/base_k3baudiocdtextallfieldswidget.ui10
-rw-r--r--src/projects/base_k3baudiocdtextwidget.ui10
-rw-r--r--src/projects/base_k3baudiotrackwidget.ui10
-rw-r--r--src/projects/base_k3bbootimageview.ui10
-rw-r--r--src/projects/base_k3bdataimagesettings.ui4
-rw-r--r--src/projects/base_k3bdatavolumedescwidget.ui12
-rw-r--r--src/projects/base_k3bmovixoptionswidget.ui6
-rw-r--r--src/projects/k3baudioburndialog.cpp4
-rw-r--r--src/projects/k3baudiocdtextwidget.cpp2
-rw-r--r--src/projects/k3baudiodatasourceeditwidget.cpp6
-rw-r--r--src/projects/k3baudiodatasourceviewitem.cpp4
-rw-r--r--src/projects/k3baudioeditorwidget.cpp44
-rw-r--r--src/projects/k3baudioeditorwidget.h4
-rw-r--r--src/projects/k3baudiotrackaddingdialog.cpp24
-rw-r--r--src/projects/k3baudiotrackdialog.cpp4
-rw-r--r--src/projects/k3baudiotrackplayer.cpp6
-rw-r--r--src/projects/k3baudiotracksplitdialog.cpp22
-rw-r--r--src/projects/k3baudiotracktrmlookupdialog.cpp4
-rw-r--r--src/projects/k3baudiotrackview.cpp4
-rw-r--r--src/projects/k3baudiotrackviewitem.cpp4
-rw-r--r--src/projects/k3baudioview.cpp2
-rw-r--r--src/projects/k3bbootimageview.cpp2
-rw-r--r--src/projects/k3bdataadvancedimagesettingswidget.cpp10
-rw-r--r--src/projects/k3bdataburndialog.cpp6
-rw-r--r--src/projects/k3bdatadirtreeview.cpp8
-rw-r--r--src/projects/k3bdatafileview.cpp2
-rw-r--r--src/projects/k3bdataimagesettingswidget.cpp8
-rw-r--r--src/projects/k3bdatapropertiesdialog.cpp10
-rw-r--r--src/projects/k3bdataurladdingdialog.cpp56
-rw-r--r--src/projects/k3bdataview.cpp2
-rw-r--r--src/projects/k3bdataviewitem.cpp8
-rw-r--r--src/projects/k3bdvdburndialog.cpp6
-rw-r--r--src/projects/k3bencodingconverter.cpp2
-rw-r--r--src/projects/k3bfillstatusdisplay.cpp54
-rw-r--r--src/projects/k3bfillstatusdisplay.h4
-rw-r--r--src/projects/k3bmixedburndialog.cpp4
-rw-r--r--src/projects/k3bmixeddirtreeview.cpp4
-rw-r--r--src/projects/k3bmixedview.cpp2
-rw-r--r--src/projects/k3bmovixburndialog.cpp6
-rw-r--r--src/projects/k3bmovixdvdburndialog.cpp6
-rw-r--r--src/projects/k3bmovixlistview.cpp4
-rw-r--r--src/projects/k3bmovixview.cpp2
-rw-r--r--src/projects/k3bmusicbrainzjob.cpp10
-rw-r--r--src/projects/k3bprojectburndialog.cpp12
-rw-r--r--src/projects/k3bvcdburndialog.cpp36
-rw-r--r--src/projects/k3bvcdlistview.cpp2
-rw-r--r--src/projects/k3bvcdtrackdialog.cpp60
-rw-r--r--src/projects/k3bvcdview.cpp2
-rw-r--r--src/projects/k3bvideodvdburndialog.cpp6
-rw-r--r--src/projects/k3bview.cpp4
-rw-r--r--src/rip/base_k3baudiorippingoptionwidget.ui12
-rw-r--r--src/rip/base_k3bcddbpatternwidget.ui10
-rw-r--r--src/rip/k3baudiocdview.cpp20
-rw-r--r--src/rip/k3baudioprojectconvertingdialog.cpp4
-rw-r--r--src/rip/k3baudioprojectconvertingthread.cpp38
-rw-r--r--src/rip/k3baudiorippingdialog.cpp6
-rw-r--r--src/rip/k3baudioripthread.cpp44
-rw-r--r--src/rip/k3bcddbpatternwidget.cpp6
-rw-r--r--src/rip/k3bcuefilewriter.cpp4
-rw-r--r--src/rip/k3bcuefilewriter.h2
-rw-r--r--src/rip/k3bpatternparser.cpp8
-rw-r--r--src/rip/k3bvideocdinfo.cpp2
-rw-r--r--src/rip/k3bvideocdrip.cpp34
-rw-r--r--src/rip/k3bvideocdrippingdialog.cpp22
-rw-r--r--src/rip/k3bvideocdview.cpp14
-rw-r--r--src/rip/videodvd/base_k3bvideodvdrippingwidget.ui28
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.cpp34
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingjob.cpp16
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingpreview.cpp4
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp34
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingview.cpp6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.cpp14
141 files changed, 930 insertions, 930 deletions
diff --git a/src/fastscale/scale.cpp b/src/fastscale/scale.cpp
index 62e0661..d87717f 100644
--- a/src/fastscale/scale.cpp
+++ b/src/fastscale/scale.cpp
@@ -1925,7 +1925,7 @@ TQImage scale(const TQImage& image, int width, int height,
if( image.isNull()) return image.copy();
TQSize newSize( image.size() );
- newSize.scale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0
+ newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0
newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null
if ( newSize == image.size() ) return image.copy();
diff --git a/src/k3b.cpp b/src/k3b.cpp
index 0dc38e8..40ea871 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -20,7 +20,7 @@
#include <tqdir.h>
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqtoolbutton.h>
@@ -29,7 +29,7 @@
#include <tqevent.h>
#include <tqvaluelist.h>
#include <tqfont.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqwidgetstack.h>
#include <tqtimer.h>
@@ -181,8 +181,8 @@ K3bMainWindow::K3bMainWindow()
// FIXME: now make sure the welcome screen is displayed completely
resize( 780, 550 );
-// getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->sizeHint() ) );
-// m_dirTreeDock->resize( TQSize( m_dirTreeDock->sizeHint().width(), m_dirTreeDock->height() ) );
+// getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->tqsizeHint() ) );
+// m_dirTreeDock->resize( TQSize( m_dirTreeDock->tqsizeHint().width(), m_dirTreeDock->height() ) );
readOptions();
}
@@ -198,7 +198,7 @@ K3bMainWindow::~K3bMainWindow()
void K3bMainWindow::showEvent( TQShowEvent* e )
{
- slotCheckDockWidgetStatus();
+ slotCheckDockWidgettqStatus();
KDockMainWindow::showEvent( e );
}
@@ -288,7 +288,7 @@ void K3bMainWindow::initActions()
actionToolsBlankCdrw = new KAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()),
actionCollection(), "tools_blank_cdrw" );
- KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").arg("�"), "formatdvd", 0, TQT_TQOBJECT(this),
+ KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").tqarg("�"), "formatdvd", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" );
actionToolsWriteCdImage = new KAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()),
actionCollection(), "tools_write_cd_image" );
@@ -330,7 +330,7 @@ void K3bMainWindow::initActions()
actionFileNewMovix->setToolTip( i18n("Creates a new eMovix CD project") );
actionFileNewVcd->setToolTip( i18n("Creates a new Video CD project") );
actionToolsBlankCdrw->setToolTip( i18n("Open the CD-RW erasing dialog") );
- actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").arg("�") );
+ actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").tqarg("�") );
actionCdCopy->setToolTip( i18n("Open the CD copy dialog") );
actionToolsWriteCdImage->setToolTip( i18n("Write an Iso9660, cue/bin, or cdrecord clone image to CD") );
actionToolsWriteDvdImage->setToolTip( i18n("Write an Iso9660 image to DVD") );
@@ -398,7 +398,7 @@ void K3bMainWindow::initView()
m_documentHeader = new K3bThemedHeader( d->documentHull );
m_documentHeader->setTitle( i18n("Current Projects") );
- m_documentHeader->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+ m_documentHeader->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_documentHeader->setLeftPixmap( K3bTheme::PROJECT_LEFT );
m_documentHeader->setRightPixmap( K3bTheme::PROJECT_RIGHT );
@@ -609,7 +609,7 @@ void K3bMainWindow::readOptions()
m_dirView->readConfig( config() );
slotViewDocumentHeader();
- slotCheckDockWidgetStatus();
+ slotCheckDockWidgettqStatus();
}
@@ -635,20 +635,20 @@ void K3bMainWindow::saveProperties( KConfig* c )
int cnt = 1;
for( TQPtrListIterator<K3bDoc> it( docs ); *it; ++it ) {
// the "name" of the project (or the original url if isSaved())
- c->writePathEntry( TQString("%1 url").arg(cnt), (*it)->URL().url() );
+ c->writePathEntry( TQString("%1 url").tqarg(cnt), (*it)->URL().url() );
// is the doc modified
- c->writeEntry( TQString("%1 modified").arg(cnt), (*it)->isModified() );
+ c->writeEntry( TQString("%1 modified").tqarg(cnt), (*it)->isModified() );
// has the doc already been saved?
- c->writeEntry( TQString("%1 saved").arg(cnt), (*it)->isSaved() );
+ c->writeEntry( TQString("%1 saved").tqarg(cnt), (*it)->isSaved() );
// where does the session management save it? If it's not modified and saved this is
// the same as the url
KURL saveUrl = (*it)->URL();
if( !(*it)->isSaved() || (*it)->isModified() )
saveUrl = KURL::fromPathOrURL( saveDir + TQString::number(cnt) );
- c->writePathEntry( TQString("%1 saveurl").arg(cnt), saveUrl.url() );
+ c->writePathEntry( TQString("%1 saveurl").tqarg(cnt), saveUrl.url() );
// finally save it
k3bappcore->projectManager()->saveProject( *it, saveUrl );
@@ -690,13 +690,13 @@ void K3bMainWindow::readProperties( KConfig* c )
for( int i = 1; i <= cnt; ++i ) {
// in this case the constructor works since we saved as url()
- KURL url = c->readPathEntry( TQString("%1 url").arg(i) );
+ KURL url = c->readPathEntry( TQString("%1 url").tqarg(i) );
- bool modified = c->readBoolEntry( TQString("%1 modified").arg(i) );
+ bool modified = c->readBoolEntry( TQString("%1 modified").tqarg(i) );
- bool saved = c->readBoolEntry( TQString("%1 saved").arg(i) );
+ bool saved = c->readBoolEntry( TQString("%1 saved").tqarg(i) );
- KURL saveUrl = c->readPathEntry( TQString("%1 saveurl").arg(i) );
+ KURL saveUrl = c->readPathEntry( TQString("%1 saveurl").tqarg(i) );
// now load the project
if( K3bDoc* doc = k3bappcore->projectManager()->openProject( saveUrl ) ) {
@@ -826,7 +826,7 @@ bool K3bMainWindow::canCloseDocument( K3bDoc* doc )
return true;
switch ( KMessageBox::warningYesNoCancel( this,
- i18n("%1 has unsaved data.").arg( doc->URL().fileName() ),
+ i18n("%1 has unsaved data.").tqarg( doc->URL().fileName() ),
i18n("Closing Project"),
KStdGuiItem::save(),
KGuiItem( i18n("&Discard"), "editshred" ) ) )
@@ -940,7 +940,7 @@ void K3bMainWindow::fileSaveAs( K3bDoc* doc )
bool exists = KIO::NetAccess::exists( url, false, 0 );
if( !exists ||
( exists &&
- KMessageBox::warningContinueCancel( this, i18n("Do you want to overwrite %1?").arg( url.prettyURL() ),
+ KMessageBox::warningContinueCancel( this, i18n("Do you want to overwrite %1?").tqarg( url.prettyURL() ),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) ) {
@@ -1364,14 +1364,14 @@ void K3bMainWindow::slotDvdCopy()
void K3bMainWindow::slotShowDirTreeView()
{
m_dirTreeDock->changeHideShowState();
- slotCheckDockWidgetStatus();
+ slotCheckDockWidgettqStatus();
}
void K3bMainWindow::slotShowContentsView()
{
m_contentsDock->changeHideShowState();
- slotCheckDockWidgetStatus();
+ slotCheckDockWidgettqStatus();
}
@@ -1402,7 +1402,7 @@ void K3bMainWindow::slotContentsDockHidden()
}
-void K3bMainWindow::slotCheckDockWidgetStatus()
+void K3bMainWindow::slotCheckDockWidgettqStatus()
{
actionViewContentsView->setChecked( m_contentsDock->isVisible() );
actionViewDirTreeView->setChecked( m_dirTreeDock->isVisible() );
diff --git a/src/k3b.h b/src/k3b.h
index d6d5d7c..1562e57 100644
--- a/src/k3b.h
+++ b/src/k3b.h
@@ -215,7 +215,7 @@ class K3bMainWindow : public KParts::DockMainWindow
void slotViewDocumentHeader();
- void slotCheckDockWidgetStatus();
+ void slotCheckDockWidgettqStatus();
/** changes the statusbar contents for the standard label permanently, used to indicate current actions.
* @param text the text that is displayed in the statusbar
@@ -249,7 +249,7 @@ class K3bMainWindow : public KParts::DockMainWindow
void fileSaveAs( K3bDoc* doc = 0 );
void closeProject( K3bDoc* );
- /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
+ /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
* file
*/
void saveOptions();
diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp
index 9498a71..776df75 100644
--- a/src/k3bappdevicemanager.cpp
+++ b/src/k3bappdevicemanager.cpp
@@ -230,7 +230,7 @@ void K3bAppDeviceManager::setReadSpeed()
"and the spinning noise is intrusive."
"<p>Be aware that this has no influence on K3b since it will "
"change the reading speed again when copying CDs or DVDs.")
- .arg(currentDevice()->vendor() + " " + currentDevice()->description()),
+ .tqarg(currentDevice()->vendor() + " " + currentDevice()->description()),
12,
1,
currentDevice()->maxReadSpeed(),
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp
index 3e119af..b9640bc 100644
--- a/src/k3bapplication.cpp
+++ b/src/k3bapplication.cpp
@@ -297,7 +297,7 @@ bool K3bApplication::processCmdLineArgs()
// FIXME: seems not like the right place...
if( args->isSet( "ao" ) )
if( !m_audioServer->setOutputMethod( args->getOption( "ao" ) ) )
- K3bPassivePopup::showPopup( i18n("Could not find Audio Output plugin '%1'").arg( args->getOption("ao").data() ),
+ K3bPassivePopup::showPopup( i18n("Could not find Audio Output plugin '%1'").tqarg( args->getOption("ao").data() ),
i18n("Initialization Problem"),
K3bPassivePopup::Warning );
diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp
index 3d39d33..5832940 100644
--- a/src/k3baudioplayer.cpp
+++ b/src/k3baudioplayer.cpp
@@ -20,14 +20,14 @@
#include <tqlabel.h>
#include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <tqdatetime.h>
#include <tqfont.h>
#include <tqslider.h>
#include <tqlistview.h>
#include <tqfile.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqheader.h>
#include <tqevent.h>
#include <tqdragobject.h>
@@ -169,8 +169,8 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
m_viewPlayList = new K3bPlayListView( this );
- m_labelOverallTime->setAlignment( AlignHCenter | AlignVCenter );
- m_labelCurrentTime->setAlignment( AlignHCenter | AlignVCenter );
+ m_labelOverallTime->tqsetAlignment( AlignHCenter | AlignVCenter );
+ m_labelCurrentTime->tqsetAlignment( AlignHCenter | AlignVCenter );
m_labelOverallTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain );
m_labelCurrentTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain );
m_labelFilename->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain );
@@ -194,7 +194,7 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
m_updateTimer = new TQTimer( this );
// ------------------------------------------------------------------------
- // layout
+ // tqlayout
// ------------------------------------------------------------------------
TQGridLayout* grid = new TQGridLayout( this );
grid->setSpacing( 2 );
@@ -586,13 +586,13 @@ void K3bAudioPlayer::slotUpdateFilename()
switch( state() ) {
case PLAYING:
- display.prepend( TQString("(%1) ").arg(i18n("playing")) );
+ display.prepend( TQString("(%1) ").tqarg(i18n("playing")) );
break;
case PAUSED:
- display.prepend( TQString("(%1) ").arg(i18n("paused")) );
+ display.prepend( TQString("(%1) ").tqarg(i18n("paused")) );
break;
case STOPPED:
- display.prepend( TQString("(%1) ").arg(i18n("stopped")) );
+ display.prepend( TQString("(%1) ").tqarg(i18n("stopped")) );
break;
default:
break;
diff --git a/src/k3bburnprogressdialog.cpp b/src/k3bburnprogressdialog.cpp
index 2767229..e6dcc55 100644
--- a/src/k3bburnprogressdialog.cpp
+++ b/src/k3bburnprogressdialog.cpp
@@ -29,7 +29,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqframe.h>
@@ -38,7 +38,7 @@ K3bBurnProgressDialog::K3bBurnProgressDialog( TQWidget *parent, const char *name
: K3bJobProgressDialog(parent,name, showSubProgress, modal, wf)
{
m_labelWritingSpeed = new TQLabel( m_frameExtraInfo, "m_labelWritingSpeed" );
- // m_labelWritingSpeed->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ // m_labelWritingSpeed->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_frameExtraInfoLayout->addWidget( m_labelWritingSpeed, 2, 0 );
m_frameExtraInfoLayout->addWidget( new TQLabel( i18n("Estimated writing speed:"), m_frameExtraInfo ), 1, 0 );
@@ -83,7 +83,7 @@ void K3bBurnProgressDialog::setBurnJob( K3bBurnJob* burnJob )
K3bJobProgressDialog::setJob(burnJob);
if( burnJob ) {
- connect( burnJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SLOT(slotBufferStatus(int)) );
+ connect( burnJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SLOT(slotBuffertqStatus(int)) );
connect( burnJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) );
connect( burnJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SLOT(slotWriteSpeed(int, int)) );
connect( burnJob, TQT_SIGNAL(burning(bool)), m_progressWritingBuffer, TQT_SLOT(setEnabled(bool)) );
@@ -91,7 +91,7 @@ void K3bBurnProgressDialog::setBurnJob( K3bBurnJob* burnJob )
connect( burnJob, TQT_SIGNAL(burning(bool)), m_labelWritingSpeed, TQT_SLOT(setEnabled(bool)) );
if( burnJob->writer() )
- m_labelWriter->setText( i18n("Writer: %1 %2").arg(burnJob->writer()->vendor()).
+ m_labelWriter->setText( i18n("Writer: %1 %2").tqarg(burnJob->writer()->vendor()).
arg(burnJob->writer()->description()) );
m_labelWritingSpeed->setText( i18n("no info") );
@@ -112,7 +112,7 @@ void K3bBurnProgressDialog::slotFinished( bool success )
}
-void K3bBurnProgressDialog::slotBufferStatus( int b )
+void K3bBurnProgressDialog::slotBuffertqStatus( int b )
{
m_progressWritingBuffer->setFormat( "%p%" );
m_progressWritingBuffer->setValue( b );
@@ -128,7 +128,7 @@ void K3bBurnProgressDialog::slotDeviceBuffer( int b )
void K3bBurnProgressDialog::slotWriteSpeed( int s, int multiplicator )
{
- m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) );
+ m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) );
}
#include "k3bburnprogressdialog.moc"
diff --git a/src/k3bburnprogressdialog.h b/src/k3bburnprogressdialog.h
index 44088e7..2b7efb0 100644
--- a/src/k3bburnprogressdialog.h
+++ b/src/k3bburnprogressdialog.h
@@ -42,7 +42,7 @@ class K3bBurnProgressDialog : public K3bJobProgressDialog {
protected slots:
void slotWriteSpeed( int, int );
- void slotBufferStatus( int );
+ void slotBuffertqStatus( int );
void slotDeviceBuffer( int );
void slotFinished(bool);
diff --git a/src/k3bcontentsview.cpp b/src/k3bcontentsview.cpp
index 56da3fe..2cafbf2 100644
--- a/src/k3bcontentsview.cpp
+++ b/src/k3bcontentsview.cpp
@@ -18,7 +18,7 @@
#include <k3bthemedheader.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
@@ -51,7 +51,7 @@ K3bContentsView::~K3bContentsView()
void K3bContentsView::setMainWidget( TQWidget* w )
{
m_centerWidget = w;
- ((TQVBoxLayout*)layout())->addWidget( w );
+ ((TQVBoxLayout*)tqlayout())->addWidget( w );
}
diff --git a/src/k3bdataprojectinterface.cpp b/src/k3bdataprojectinterface.cpp
index ccb6c19..3a115e5 100644
--- a/src/k3bdataprojectinterface.cpp
+++ b/src/k3bdataprojectinterface.cpp
@@ -102,12 +102,12 @@ bool K3bDataProjectInterface::isFolder( const TQString& path ) const
}
-TQStringList K3bDataProjectInterface::children( const TQString& path ) const
+TQStringList K3bDataProjectInterface::tqchildren( const TQString& path ) const
{
TQStringList l;
K3bDataItem* item = m_dataDoc->root()->findByPath( path );
if( item && item->isDir() ) {
- const TQPtrList<K3bDataItem>& cl = static_cast<K3bDirItem*>(item)->children();
+ const TQPtrList<K3bDataItem>& cl = static_cast<K3bDirItem*>(item)->tqchildren();
for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it )
l.append( it.current()->k3bName() );
}
diff --git a/src/k3bdataprojectinterface.h b/src/k3bdataprojectinterface.h
index a69bac7..0cc9229 100644
--- a/src/k3bdataprojectinterface.h
+++ b/src/k3bdataprojectinterface.h
@@ -90,7 +90,7 @@ class K3bDataProjectInterface : public K3bProjectInterface
/**
* \return the names of the child elements of the item determined by path.
*/
- TQStringList children( const TQString& path ) const;
+ TQStringList tqchildren( const TQString& path ) const;
/**
* Set the sort weight of an item
diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp
index b0bc50b..956f927 100644
--- a/src/k3bdebuggingoutputdialog.cpp
+++ b/src/k3bdebuggingoutputdialog.cpp
@@ -22,10 +22,10 @@
#include <k3bversion.h>
#include <k3bglobals.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqcursor.h>
#include <tqfile.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <klocale.h>
#include <kstdguiitem.h>
@@ -122,12 +122,12 @@ void K3bDebuggingOutputDialog::clear()
K3bDevice::Device* dev = *it;
addOutput( "Devices",
TQString( "%1 (%2, %3) [%5] [%6] [%7]" )
- .arg( dev->vendor() + " " + dev->description() + " " + dev->version() )
- .arg( dev->blockDeviceName() )
- .arg( dev->genericDevice() )
- .arg( K3bDevice::deviceTypeString( dev->type() ) )
- .arg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
- .arg( K3bDevice::writingModeString( dev->writingModes() ) ) );
+ .tqarg( dev->vendor() + " " + dev->description() + " " + dev->version() )
+ .tqarg( dev->blockDeviceName() )
+ .tqarg( dev->genericDevice() )
+ .tqarg( K3bDevice::deviceTypeString( dev->type() ) )
+ .tqarg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
+ .tqarg( K3bDevice::writingModeString( dev->writingModes() ) ) );
}
}
@@ -138,7 +138,7 @@ void K3bDebuggingOutputDialog::slotUser1()
if( !filename.isEmpty() ) {
TQFile f( filename );
if( !f.exists() || KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").arg(filename),
+ i18n("Do you want to overwrite %1?").tqarg(filename),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) {
@@ -147,7 +147,7 @@ void K3bDebuggingOutputDialog::slotUser1()
t << debugView->text();
}
else {
- KMessageBox::error( this, i18n("Could not open file %1").arg(filename) );
+ KMessageBox::error( this, i18n("Could not open file %1").tqarg(filename) );
}
}
}
@@ -156,7 +156,7 @@ void K3bDebuggingOutputDialog::slotUser1()
void K3bDebuggingOutputDialog::slotUser2()
{
- TQApplication::clipboard()->setText( debugView->text(), TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setText( debugView->text(), TQClipboard::Clipboard );
}
#include "k3bdebuggingoutputdialog.moc"
diff --git a/src/k3bdebuggingoutputfile.cpp b/src/k3bdebuggingoutputfile.cpp
index 3e29ef0..f1ce1dc 100644
--- a/src/k3bdebuggingoutputfile.cpp
+++ b/src/k3bdebuggingoutputfile.cpp
@@ -26,7 +26,7 @@
#include <kglobalsettings.h>
#include <kapplication.h>
-#include <textstream.h>
+#include <tqtextstream.h>
K3bDebuggingOutputFile::K3bDebuggingOutputFile()
@@ -50,12 +50,12 @@ bool K3bDebuggingOutputFile::open()
K3bDevice::Device* dev = *it;
addOutput( "Devices",
TQString( "%1 (%2, %3) [%5] [%6] [%7]" )
- .arg( dev->vendor() + " " + dev->description() + " " + dev->version() )
- .arg( dev->blockDeviceName() )
- .arg( dev->genericDevice() )
- .arg( K3bDevice::deviceTypeString( dev->type() ) )
- .arg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
- .arg( K3bDevice::writingModeString( dev->writingModes() ) ) );
+ .tqarg( dev->vendor() + " " + dev->description() + " " + dev->version() )
+ .tqarg( dev->blockDeviceName() )
+ .tqarg( dev->genericDevice() )
+ .tqarg( K3bDevice::deviceTypeString( dev->type() ) )
+ .tqarg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
+ .tqarg( K3bDevice::writingModeString( dev->writingModes() ) ) );
}
return true;
diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp
index d40b775..50c69b0 100644
--- a/src/k3bdirview.cpp
+++ b/src/k3bdirview.cpp
@@ -48,7 +48,7 @@
#include <tqheader.h>
#include <tqsplitter.h>
#include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqiconset.h>
#include <tqvaluelist.h>
#include <tqlabel.h>
@@ -247,7 +247,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium )
else {
if( KMessageBox::questionYesNo( this,
i18n("Found %1. Do you want K3b to mount the data part "
- "or show all the tracks?").arg( i18n("Video CD") ),
+ "or show all the tracks?").tqarg( i18n("Video CD") ),
i18n("Video CD"),
i18n("Mount CD"),
i18n("Show Video Tracks") ) == KMessageBox::No ) {
@@ -260,7 +260,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium )
else if( medium.content() & K3bMedium::CONTENT_AUDIO ) {
if( KMessageBox::questionYesNo( this,
i18n("Found %1. Do you want K3b to mount the data part "
- "or show all the tracks?").arg( i18n("Audio CD") ),
+ "or show all the tracks?").tqarg( i18n("Audio CD") ),
i18n("Audio CD"),
i18n("Mount CD"),
i18n("Show Audio Tracks") ) == KMessageBox::No ) {
@@ -298,9 +298,9 @@ void K3bDirView::slotMountFinished( const TQString& mp )
else {
m_viewStack->raiseWidget( m_fileView );
K3bPassivePopup::showPopup( i18n("<p>K3b was unable to mount medium <b>%1</b> in device <em>%2 - %3</em>")
- .arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
- .arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
- .arg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
+ .tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
+ .tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
+ .tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
i18n("Mount Failed"),
K3bPassivePopup::Warning );
}
@@ -314,9 +314,9 @@ void K3bDirView::slotUnmountFinished( bool success )
}
else {
K3bPassivePopup::showPopup( i18n("<p>K3b was unable to unmount medium <b>%1</b> in device <em>%2 - %3</em>")
- .arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
- .arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
- .arg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
+ .tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
+ .tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
+ .tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
i18n("Unmount Failed"),
K3bPassivePopup::Warning );
}
diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index 45dafba..028e020 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -27,13 +27,13 @@
#include <k3biso9660.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqfont.h>
#include <tqcolor.h>
#include <tqheader.h>
#include <tqstring.h>
#include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqpixmap.h>
#include <tqregion.h>
#include <tqframe.h>
@@ -231,7 +231,7 @@ void K3bDiskInfoView::reloadMedium()
// if we have multiple sessions we create a header item for every session
KListViewItem* trackItem = 0;
if( medium().diskInfo().numSessions() > 1 && medium().toc()[0].session() > 0 ) {
- trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").arg(1) );
+ trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").tqarg(1) );
lastSession = 1;
}
else
@@ -248,7 +248,7 @@ void K3bDiskInfoView::reloadMedium()
trackItem->setOpen(true);
trackItem = new HeaderViewItem( trackHeaderItem,
m_infoView->lastItem()->parent(),
- i18n("Session %1").arg(lastSession) );
+ i18n("Session %1").tqarg(lastSession) );
}
item = new KListViewItem( trackItem, item );
@@ -269,21 +269,21 @@ void K3bDiskInfoView::reloadMedium()
else
text = i18n("Data");
}
- item->setText( 0, i18n("%1 (%2)").arg( TQString::number(index).rightJustify( 2, ' ' )).arg(text) );
+ item->setText( 0, i18n("%1 (%2)").tqarg( TQString::number(index).rightJustify( 2, ' ' )).tqarg(text) );
item->setText( 1, TQString( "%1/%2" )
- .arg( track.copyPermitted() ? i18n("copy") : i18n("no copy") )
- .arg( track.type() == K3bTrack::AUDIO
+ .tqarg( track.copyPermitted() ? i18n("copy") : i18n("no copy") )
+ .tqarg( track.type() == K3bTrack::AUDIO
? ( track.preEmphasis() ? i18n("preemp") : i18n("no preemp") )
: ( track.recordedIncremental() ? i18n("incremental") : i18n("uninterrupted") ) ) );
item->setText( 2,
TQString("%1 - %2")
- .arg(track.firstSector().lba())
- .arg(track.lastSector().lba()) );
+ .tqarg(track.firstSector().lba())
+ .tqarg(track.lastSector().lba()) );
item->setText( 3, TQString::number( track.length().lba() ) + " (" + track.length().toString() + ")" );
#ifdef K3B_DEBUG
if( track.type() == K3bTrack::AUDIO )
- item->setText( 4, TQString( "%1 (%2)" ).arg(track.index0().toString()).arg(track.index0().lba()) );
+ item->setText( 4, TQString( "%1 (%2)" ).tqarg(track.index0().toString()).tqarg(track.index0().lba()) );
#endif
++index;
}
@@ -350,24 +350,24 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
if( info.isDvdMedia() )
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Media ID:"),
- !info.mediaId().isEmpty() ? TQString::fromLatin1( info.mediaId() ) : i18n("unknown") );
+ !info.mediaId().isEmpty() ? TQString::tqfromLatin1( info.mediaId() ) : i18n("unknown") );
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Capacity:"),
- i18n("%1 min").arg(info.capacity().toString()),
+ i18n("%1 min").tqarg(info.capacity().toString()),
KIO::convertSize(info.capacity().mode1Bytes()) );
if( !info.empty() )
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Used Capacity:"),
- i18n("%1 min").arg(info.size().toString()),
+ i18n("%1 min").tqarg(info.size().toString()),
KIO::convertSize(info.size().mode1Bytes()) );
if( info.appendable() )
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Remaining:"),
- i18n("%1 min").arg( info.remainingSize().toString() ),
+ i18n("%1 min").tqarg( info.remainingSize().toString() ),
KIO::convertSize(info.remainingSize().mode1Bytes()) );
atipChild = new KListViewItem( atipItem, atipChild,
@@ -427,7 +427,7 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
if( info.isDvdMedia() )
s.append( TQString().sprintf( "%.1fx (%d KB/s)", (double)*it / 1385.0, *it ) );
else
- s.append( TQString( "%1x (%2 KB/s)" ).arg( *it/175 ).arg( *it ) );
+ s.append( TQString( "%1x (%2 KB/s)" ).tqarg( *it/175 ).tqarg( *it ) );
}
atipChild->setText( 1, s );
@@ -476,10 +476,10 @@ void K3bDiskInfoView::createIso9660InfoItems( const K3bIso9660SimplePrimaryDescr
// iso9660Child = new KListViewItem( iso9660Item, iso9660Child,
// i18n("Volume Size:"),
// TQString( "%1 (%2*%3)" )
-// .arg(iso.logicalBlockSize
+// .tqarg(iso.logicalBlockSize
// *iso.volumeSpaceSize)
-// .arg(iso.logicalBlockSize)
-// .arg(iso.volumeSpaceSize),
+// .tqarg(iso.logicalBlockSize)
+// .tqarg(iso.volumeSpaceSize),
// KIO::convertSize(iso.logicalBlockSize
// *iso.volumeSpaceSize) );
diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index ba0e53f..619db8c 100644
--- a/src/k3bemptydiscwaiter.cpp
+++ b/src/k3bemptydiscwaiter.cpp
@@ -30,7 +30,7 @@
#include <tqtimer.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqpushbutton.h>
#include <tqapplication.h>
@@ -95,10 +95,10 @@ K3bEmptyDiscWaiter::K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* par
// setup the gui
// -----------------------------
d->labelRequest = new TQLabel( plainPage() );
- d->labelRequest->setAlignment( TQt::AlignLeft | TQt::AlignVCenter );
+ d->labelRequest->tqsetAlignment( TQt::AlignLeft | TQt::AlignVCenter );
d->labelFoundMedia = new TQLabel( plainPage() );
d->pixLabel = new TQLabel( plainPage() );
- d->pixLabel->setAlignment( TQt::AlignHCenter | TQt::AlignTop );
+ d->pixLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop );
TQFont f( d->labelFoundMedia->font() );
f.setBold(true);
@@ -152,11 +152,11 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
//
if( (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD) &&
(d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_CD) )
- d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").arg("�");
+ d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").tqarg("�");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_SL )
- d->wantedMediaTypeString = i18n("DVD%1R(W)").arg("�");
+ d->wantedMediaTypeString = i18n("DVD%1R(W)").tqarg("�");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_DL )
- d->wantedMediaTypeString = i18n("Double Layer DVD%1R").arg("�");
+ d->wantedMediaTypeString = i18n("Double Layer DVD%1R").tqarg("�");
else
d->wantedMediaTypeString = i18n("CD-R(W)");
@@ -164,44 +164,44 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
if( (d->wantedMediaState & K3bDevice::STATE_COMPLETE) && (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) )
d->labelRequest->setText( i18n("Please insert a complete or appendable %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .arg(d->device->vendor())
- .arg(d->device->description())
- .arg(d->device->devicename())
- .arg( d->wantedMediaTypeString ) );
+ .tqarg(d->device->vendor())
+ .tqarg(d->device->description())
+ .tqarg(d->device->devicename())
+ .tqarg( d->wantedMediaTypeString ) );
else if( d->wantedMediaState & K3bDevice::STATE_COMPLETE )
d->labelRequest->setText( i18n("Please insert a complete %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .arg(d->device->vendor())
- .arg(d->device->description())
- .arg(d->device->devicename())
- .arg( d->wantedMediaTypeString ) );
+ .tqarg(d->device->vendor())
+ .tqarg(d->device->description())
+ .tqarg(d->device->devicename())
+ .tqarg( d->wantedMediaTypeString ) );
else if( (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) && (d->wantedMediaState & K3bDevice::STATE_EMPTY) )
d->labelRequest->setText( i18n("Please insert an empty or appendable %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .arg(d->device->vendor())
- .arg(d->device->description())
- .arg(d->device->devicename())
- .arg( d->wantedMediaTypeString ) );
+ .tqarg(d->device->vendor())
+ .tqarg(d->device->description())
+ .tqarg(d->device->devicename())
+ .tqarg( d->wantedMediaTypeString ) );
else if( d->wantedMediaState & K3bDevice::STATE_INCOMPLETE )
d->labelRequest->setText( i18n("Please insert an appendable %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .arg(d->device->vendor())
- .arg(d->device->description())
- .arg(d->device->devicename())
- .arg( d->wantedMediaTypeString ) );
+ .tqarg(d->device->vendor())
+ .tqarg(d->device->description())
+ .tqarg(d->device->devicename())
+ .tqarg( d->wantedMediaTypeString ) );
else if( d->wantedMediaState & K3bDevice::STATE_EMPTY )
d->labelRequest->setText( i18n("Please insert an empty %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .arg(d->device->vendor())
- .arg(d->device->description())
- .arg(d->device->devicename())
- .arg( d->wantedMediaTypeString ) );
+ .tqarg(d->device->vendor())
+ .tqarg(d->device->description())
+ .tqarg(d->device->devicename())
+ .tqarg( d->wantedMediaTypeString ) );
else // fallback case (this should not happen in K3b)
d->labelRequest->setText( i18n("Please insert a suitable medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .arg(d->device->vendor())
- .arg(d->device->description())
- .arg(d->device->devicename()) );
+ .tqarg(d->device->vendor())
+ .tqarg(d->device->description())
+ .tqarg(d->device->devicename()) );
}
else
@@ -340,10 +340,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. "
"Should it be overwritten?")
- .arg("DVD+RW")
- .arg(d->device->vendor())
- .arg(d->device->description()),
- i18n("Found %1").arg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
+ .tqarg("DVD+RW")
+ .tqarg(d->device->vendor())
+ .tqarg(d->device->description()),
+ i18n("Found %1").tqarg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
finishWaiting( K3bDevice::MEDIA_DVD_PLUS_RW );
}
else {
@@ -410,10 +410,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. "
"Should it be overwritten?")
- .arg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType()))
- .arg(d->device->vendor())
- .arg(d->device->description()),
- i18n("Found %1").arg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
+ .tqarg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType()))
+ .tqarg(d->device->vendor())
+ .tqarg(d->device->description()),
+ i18n("Found %1").tqarg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
finishWaiting( K3bDevice::MEDIA_DVD_RW_OVWR );
}
else {
@@ -467,10 +467,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. "
"Should it be formatted?")
- .arg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) )
- .arg(d->device->vendor())
- .arg(d->device->description()),
- i18n("Found %1").arg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) {
+ .tqarg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) )
+ .tqarg(d->device->vendor())
+ .tqarg(d->device->description()),
+ i18n("Found %1").tqarg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) {
kdDebug() << "(K3bEmptyDiscWaiter) ------ formatting DVD-RW." << endl;
@@ -542,7 +542,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
if( formatWithoutAsking ||
KMessageBox::questionYesNo( parentWidgetToUse(),
i18n("Found rewritable media in %1 - %2. "
- "Should it be erased?").arg(d->device->vendor()).arg(d->device->description()),
+ "Should it be erased?").tqarg(d->device->vendor()).tqarg(d->device->description()),
i18n("Found Rewritable Disk"),
KGuiItem(i18n("&Erase"), "cdrwblank"),
KGuiItem(i18n("E&ject")) ) == KMessageBox::Yes ) {
diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp
index 62e4936..a4b3d3a 100644
--- a/src/k3bfiletreecombobox.cpp
+++ b/src/k3bfiletreecombobox.cpp
@@ -29,7 +29,7 @@
#include <tqheader.h>
#include <tqevent.h>
#include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqdrawutil.h>
#include <tqdir.h>
@@ -154,8 +154,8 @@ void K3bFileTreeComboBox::popup()
// code mainly from qcombobox.cpp
m_fileTreeView->triggerUpdate();
- int w = TQMAX( m_fileTreeView->sizeHint().width(), width() );
- int h = m_fileTreeView->sizeHint().height();
+ int w = TQMAX( m_fileTreeView->tqsizeHint().width(), width() );
+ int h = m_fileTreeView->tqsizeHint().height();
TQRect screen = TQApplication::desktop()->availableGeometry( this );
int sx = screen.x(); // screen pos
int sy = screen.y();
@@ -198,7 +198,7 @@ void K3bFileTreeComboBox::popdown()
{
m_fileTreeView->hide();
d->poppedUp = false;
- repaint(); // repaint the arrow
+ tqrepaint(); // tqrepaint the arrow
}
@@ -276,7 +276,7 @@ bool K3bFileTreeComboBox::eventFilter( TQObject* o, TQEvent* e )
if ( !TQT_TQRECT_OBJECT(m_fileTreeView->rect()).contains( me->pos() ) ) {
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
- arrowRect = TQStyle::visualRect(arrowRect, this);
+ arrowRect = TQStyle::tqvisualRect(arrowRect, this);
// Correction for motif style, where arrow is smaller
// and thus has a rect that doesn't fit the button.
@@ -310,7 +310,7 @@ void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e )
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
- arrowRect = TQStyle::visualRect(arrowRect, this);
+ arrowRect = TQStyle::tqvisualRect(arrowRect, this);
// Correction for motif style, where arrow is smaller
// and thus has a rect that doesn't fit the button.
@@ -318,7 +318,7 @@ void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e )
if ( arrowRect.contains( e->pos() ) ) {
popup();
- repaint( FALSE );
+ tqrepaint( FALSE );
}
}
@@ -339,7 +339,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
// we only need this since there is no way to change the status of the arrow-button
TQPainter p( this );
- const TQColorGroup & g = colorGroup();
+ const TQColorGroup & g = tqcolorGroup();
p.setPen(g.text());
TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -356,7 +356,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
// bool reverse = TQApplication::reverseLayout();
- tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+ tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
flags, TQStyle::SC_All,
(d->poppedUp ?
TQStyle::SC_ComboBoxArrow :
@@ -364,7 +364,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField );
- re = TQStyle::visualRect(re, this);
+ re = TQStyle::tqvisualRect(re, this);
p.setClipRect( re );
// TQListBoxItem * item = listBox()->item( 0 );
@@ -380,7 +380,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
const TQPixmap *pix = item->pixmap();
if ( pix ) {
p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(),
- colorGroup().brush( TQColorGroup::Base ) );
+ tqcolorGroup().brush( TQColorGroup::Base ) );
p.drawPixmap( re.x() + 2, re.y() +
( re.height() - pix->height() ) / 2, *pix );
}
diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp
index 1f5df70..c56d1e5 100644
--- a/src/k3bfiletreeview.cpp
+++ b/src/k3bfiletreeview.cpp
@@ -46,13 +46,13 @@
#include <tqfont.h>
#include <tqstyle.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
K3bDeviceBranch::K3bDeviceBranch( KFileTreeView* view, K3bDevice::Device* dev, KFileTreeViewItem* item )
: KFileTreeBranch( view,
KURL( "media:/" + dev->blockDeviceName() ),
- TQString("%1 - %2").arg(dev->vendor()).arg(dev->description()),
+ TQString("%1 - %2").tqarg(dev->vendor()).tqarg(dev->description()),
( dev->burner()
? SmallIcon("cdwriter_unmount")
: SmallIcon("cdrom_unmount") ),
@@ -99,13 +99,13 @@ void K3bDeviceBranch::updateLabel()
{
if( m_showBlockDeviceName )
setName( TQString("%1 %2 (%3)")
- .arg(m_device->vendor())
- .arg(m_device->description())
- .arg(m_device->blockDeviceName()) );
+ .tqarg(m_device->vendor())
+ .tqarg(m_device->description())
+ .tqarg(m_device->blockDeviceName()) );
else
setName( TQString("%1 %2")
- .arg(m_device->vendor())
- .arg(m_device->description()) );
+ .tqarg(m_device->vendor())
+ .tqarg(m_device->description()) );
if( k3bappcore->mediaCache() ) {
root()->setMultiLinesEnabled( true );
@@ -182,7 +182,7 @@ K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeView* parent,
void K3bDeviceBranchViewItem::setCurrent( bool c )
{
m_bCurrent = c;
- repaint();
+ tqrepaint();
}
@@ -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()->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, listView(),
TQRect( 0, textheight, w + 1, height() - textheight + 1 ), cg,
TQStyle::Style_Enabled,
TQStyle::SC_ListViewExpand,
@@ -343,7 +343,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
lay->addMultiCellWidget( label, 0, 0, 0, 1 );
label = new TQLabel( details, tooltip );
label->setMargin( 9 );
- label->setAlignment( Qt::Vertical );
+ label->tqsetAlignment( Qt::Vertical );
lay->addMultiCellWidget( label, 1, 2, 0, 0 );
label = new TQLabel( tooltip );
lay->addWidget( label, 2, 1 );
@@ -374,7 +374,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
}
// the tooltip will take care of deleting the widget
- tip( m_view->itemRect( item ), tooltip );
+ tip( m_view->tqitemRect( item ), tooltip );
}
@@ -722,7 +722,7 @@ void K3bFileTreeView::updateMinimumWidth()
}
// width of the items + scrollbar width + the frame + a little eyecandy spacing
- setMinimumWidth( w + verticalScrollBar()->sizeHint().width() + 2*frameWidth() + 2 );
+ setMinimumWidth( w + verticalScrollBar()->tqsizeHint().width() + 2*frameWidth() + 2 );
}
#include "k3bfiletreeview.moc"
diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp
index 73ae31d..556bab3 100644
--- a/src/k3bfileview.cpp
+++ b/src/k3bfileview.cpp
@@ -22,7 +22,7 @@
#include <tqwidget.h>
#include <tqdragobject.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqdir.h>
#include <tqvbox.h>
#include <tqlabel.h>
@@ -63,15 +63,15 @@ KActionCollection* K3bFileView::actionCollection() const
void K3bFileView::setupGUI()
{
- TQVBoxLayout* layout = new TQVBoxLayout( this );
- // layout->setAutoAdd( true );
+ TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+ // tqlayout->setAutoAdd( true );
m_dirOp = new K3bDirOperator( KURL::fromPathOrURL(TQDir::home().absPath()), this );
m_toolBox = new K3bToolBox( this );
- layout->addWidget( m_toolBox );
- layout->addWidget( m_dirOp );
- layout->setStretchFactor( m_dirOp, 1 );
+ tqlayout->addWidget( m_toolBox );
+ tqlayout->addWidget( m_dirOp );
+ tqlayout->setStretchFactor( m_dirOp, 1 );
// setup actions
KAction* actionHome = m_dirOp->actionCollection()->action("home");
diff --git a/src/k3bfirstrun.cpp b/src/k3bfirstrun.cpp
index 7825356..f27d927 100644
--- a/src/k3bfirstrun.cpp
+++ b/src/k3bfirstrun.cpp
@@ -22,7 +22,7 @@
#include <kiconloader.h>
#include <kconfig.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp
index 4300c8c..8d68f6f 100644
--- a/src/k3bflatbutton.cpp
+++ b/src/k3bflatbutton.cpp
@@ -139,7 +139,7 @@ void K3bFlatButton::setHover( bool b )
}
-TQSize K3bFlatButton::sizeHint() const
+TQSize K3bFlatButton::tqsizeHint() const
{
// height: pixmap + 5 spacing + font height + frame width
// width: max( pixmap, text) + frame width
@@ -158,7 +158,7 @@ void K3bFlatButton::drawContents( TQPainter* p )
// TQRect r( mapToParent( TQPoint(lineWidth(), lineWidth()) ),
// mapToParent( TQPoint(width()-2*lineWidth(), height()-2*lineWidth() )) );
-// parentWidget()->repaint( r );
+// parentWidget()->tqrepaint( r );
// }
p->save();
diff --git a/src/k3bflatbutton.h b/src/k3bflatbutton.h
index 83ebd55..171476d 100644
--- a/src/k3bflatbutton.h
+++ b/src/k3bflatbutton.h
@@ -41,7 +41,7 @@ class K3bFlatButton : public TQFrame
~K3bFlatButton();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
public slots:
void setColors( const TQColor& fore, const TQColor& back );
diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp
index e7cf633..738661c 100644
--- a/src/k3binteractiondialog.cpp
+++ b/src/k3binteractiondialog.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqstring.h>
@@ -82,7 +82,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
// settings buttons
// ---------------------------------------------------------------------------------------------------
if( !m_configGroup.isEmpty() ) {
- TQHBoxLayout* layout2 = new TQHBoxLayout( 0, 0, spacingHint(), "layout2");
+ TQHBoxLayout* tqlayout2 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout2");
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 );
- layout2->addWidget( m_buttonLoadSettings );
+ tqlayout2->addWidget( m_buttonLoadSettings );
m_buttonSaveSettings = new TQToolButton( /*i18n("Save User Defaults"), */this, "m_buttonSaveSettings" );
((TQToolButton*)m_buttonSaveSettings)->setIconSet( SmallIconSet( "filesave" ) );
- layout2->addWidget( m_buttonSaveSettings );
+ tqlayout2->addWidget( m_buttonSaveSettings );
- mainGrid->addLayout( layout2, 2, 0 );
+ mainGrid->addLayout( tqlayout2, 2, 0 );
}
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -106,7 +106,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
// action buttons
// ---------------------------------------------------------------------------------------------------
- TQHBoxLayout* layout5 = new TQHBoxLayout( 0, 0, spacingHint(), "layout5");
+ TQHBoxLayout* tqlayout5 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout5");
if( buttonMask & START_BUTTON ) {
KGuiItem startItem = KStdGuiItem::ok();
@@ -149,33 +149,33 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
case 0: // KDE default
default:
if ( m_buttonStart )
- layout5->addWidget( m_buttonStart );
+ tqlayout5->addWidget( m_buttonStart );
if ( m_buttonSave )
- layout5->addWidget( m_buttonSave );
+ tqlayout5->addWidget( m_buttonSave );
if ( m_buttonCancel )
- layout5->addWidget( m_buttonCancel );
+ tqlayout5->addWidget( m_buttonCancel );
break;
case 1: // something different
if ( m_buttonCancel )
- layout5->addWidget( m_buttonCancel );
+ tqlayout5->addWidget( m_buttonCancel );
if ( m_buttonSave )
- layout5->addWidget( m_buttonSave );
+ tqlayout5->addWidget( m_buttonSave );
if ( m_buttonStart )
- layout5->addWidget( m_buttonStart );
+ tqlayout5->addWidget( m_buttonStart );
break;
case 2: // GTK-Style
if ( m_buttonSave )
- layout5->addWidget( m_buttonSave );
+ tqlayout5->addWidget( m_buttonSave );
if ( m_buttonCancel )
- layout5->addWidget( m_buttonCancel );
+ tqlayout5->addWidget( m_buttonCancel );
if ( m_buttonStart )
- layout5->addWidget( m_buttonStart );
+ tqlayout5->addWidget( m_buttonStart );
break;
}
- mainGrid->addLayout( layout5, 2, 2 );
+ mainGrid->addLayout( tqlayout5, 2, 2 );
mainGrid->setRowStretch( 1, 1 );
@@ -200,9 +200,9 @@ void K3bInteractionDialog::show()
}
-TQSize K3bInteractionDialog::sizeHint() const
+TQSize K3bInteractionDialog::tqsizeHint() const
{
- TQSize s = KDialog::sizeHint();
+ TQSize s = KDialog::tqsizeHint();
// I want the dialogs to look good.
// That means their height should never outgrow their width
if( s.height() > s.width() )
diff --git a/src/k3binteractiondialog.h b/src/k3binteractiondialog.h
index cb0c0ba..f6978ed 100644
--- a/src/k3binteractiondialog.h
+++ b/src/k3binteractiondialog.h
@@ -105,7 +105,7 @@ class K3bInteractionDialog : public KDialog
CANCEL_BUTTON = 4
};
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
const TQString& configGroup() const { return m_configGroup; }
diff --git a/src/k3bjobinterface.cpp b/src/k3bjobinterface.cpp
index 4eb1dd5..1037968 100644
--- a/src/k3bjobinterface.cpp
+++ b/src/k3bjobinterface.cpp
@@ -49,7 +49,7 @@ void K3bJobInterface::setJob( K3bJob* job )
connect( m_job, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) );
if( m_job->inherits( "K3bBurnJob" ) ) {
- connect( m_job, TQT_SIGNAL(bufferStatus(int)), this, TQT_SLOT(slotBuffer(int)) );
+ connect( m_job, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SLOT(slotBuffer(int)) );
connect( m_job, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) );
}
diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp
index 593e087..c179fd9 100644
--- a/src/k3bjobprogressdialog.cpp
+++ b/src/k3bjobprogressdialog.cpp
@@ -35,7 +35,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -131,7 +131,7 @@ void K3bJobProgressDialog::setupGUI()
headerLayout->addWidget( m_pixLabel );
TQFrame* frame4 = new TQFrame( headerFrame, "frame4" );
- frame4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame4->sizePolicy().hasHeightForWidth() ) );
+ frame4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame4->sizePolicy().hasHeightForWidth() ) );
frame4->setFrameShape( TQFrame::NoFrame );
frame4->setFrameShadow( TQFrame::Raised );
TQVBoxLayout* frame4Layout = new TQVBoxLayout( frame4, 6, 3, "frame4Layout");
@@ -142,12 +142,12 @@ void K3bJobProgressDialog::setupGUI()
m_labelJob_font.setPointSize( m_labelJob_font.pointSize() + 2 );
m_labelJob_font.setBold( true );
m_labelJob->setFont( m_labelJob_font );
- m_labelJob->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelJob->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
frame4Layout->addWidget( m_labelJob );
m_labelJobDetails = new K3bThemedLabel( frame4 );
- m_labelJobDetails->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelJobDetails->sizePolicy().hasHeightForWidth() ) );
- m_labelJobDetails->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelJobDetails->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelJobDetails->sizePolicy().hasHeightForWidth() ) );
+ m_labelJobDetails->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
frame4Layout->addWidget( m_labelJobDetails );
headerLayout->addWidget( frame4 );
@@ -177,7 +177,7 @@ void K3bJobProgressDialog::setupGUI()
progressHeaderLayout->setSpacing( 0 );
TQFrame* frame5 = new TQFrame( progressHeaderFrame, "frame5" );
- frame5->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame5->sizePolicy().hasHeightForWidth() ) );
+ frame5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame5->sizePolicy().hasHeightForWidth() ) );
frame5->setFrameShape( TQFrame::NoFrame );
frame5->setFrameShadow( TQFrame::Raised );
TQVBoxLayout* frame5Layout = new TQVBoxLayout( frame5, 6, 3, "frame5Layout");
@@ -190,7 +190,7 @@ void K3bJobProgressDialog::setupGUI()
frame5Layout->addWidget( m_labelTask );
m_labelElapsedTime = new K3bThemedLabel( frame5 );
- m_labelElapsedTime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelElapsedTime->sizePolicy().hasHeightForWidth() ) );
+ m_labelElapsedTime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelElapsedTime->sizePolicy().hasHeightForWidth() ) );
frame5Layout->addWidget( m_labelElapsedTime );
progressHeaderLayout->addWidget( frame5 );
@@ -198,28 +198,28 @@ void K3bJobProgressDialog::setupGUI()
mainLayout->addWidget( progressHeaderFrame );
// ------------------------------------------------------------------------------------------
- TQHBoxLayout* layout3 = new TQHBoxLayout( 0, 0, 6, "layout3");
+ TQHBoxLayout* tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
m_labelSubTask = new KCutLabel( this, "m_labelSubTask" );
- layout3->addWidget( m_labelSubTask );
+ tqlayout3->addWidget( m_labelSubTask );
m_labelSubProcessedSize = new TQLabel( this, "m_labelSubProcessedSize" );
- m_labelSubProcessedSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
- layout3->addWidget( m_labelSubProcessedSize );
- mainLayout->addLayout( layout3 );
+ m_labelSubProcessedSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ tqlayout3->addWidget( m_labelSubProcessedSize );
+ mainLayout->addLayout( tqlayout3 );
m_progressSubPercent = new KProgress( this, "m_progressSubPercent" );
mainLayout->addWidget( m_progressSubPercent );
- TQHBoxLayout* layout4 = new TQHBoxLayout( 0, 0, 6, "layout4");
+ TQHBoxLayout* tqlayout4 = new TQHBoxLayout( 0, 0, 6, "tqlayout4");
TQLabel* textLabel5 = new TQLabel( i18n("Overall progress:"), this, "textLabel5" );
- layout4->addWidget( textLabel5 );
+ tqlayout4->addWidget( textLabel5 );
m_labelProcessedSize = new TQLabel( this, "m_labelProcessedSize" );
- m_labelProcessedSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
- layout4->addWidget( m_labelProcessedSize );
- mainLayout->addLayout( layout4 );
+ m_labelProcessedSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ tqlayout4->addWidget( m_labelProcessedSize );
+ mainLayout->addLayout( tqlayout4 );
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* layout5 = new TQHBoxLayout( 0, 0, 6, "layout5");
+ TQHBoxLayout* tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5");
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- layout5->addItem( spacer );
+ tqlayout5->addItem( spacer );
m_buttonCancel = new KPushButton( KStdGuiItem::cancel(), this, "m_buttonCancel" );
- layout5->addWidget( m_buttonCancel );
+ tqlayout5->addWidget( m_buttonCancel );
m_buttonClose = new KPushButton( KStdGuiItem::close(), this );
- layout5->addWidget( m_buttonClose );
+ tqlayout5->addWidget( m_buttonClose );
m_buttonShowDebug = new TQPushButton( i18n("Show Debugging Output"), this );
- layout5->addWidget( m_buttonShowDebug );
+ tqlayout5->addWidget( m_buttonShowDebug );
- mainLayout->addLayout( layout5 );
+ mainLayout->addLayout( tqlayout5 );
m_pixLabel->setThemePixmap( K3bTheme::PROGRESS_WORKING );
@@ -314,13 +314,13 @@ void K3bJobProgressDialog::setupConnections()
void K3bJobProgressDialog::slotProcessedSize( int processed, int size )
{
- m_labelProcessedSize->setText( i18n("%1 of %2 MB").arg( processed ).arg( size ) );
+ m_labelProcessedSize->setText( i18n("%1 of %2 MB").tqarg( processed ).tqarg( size ) );
}
void K3bJobProgressDialog::slotProcessedSubSize( int processedTrackSize, int trackSize )
{
- m_labelSubProcessedSize->setText( i18n("%1 of %2 MB").arg(processedTrackSize).arg(trackSize) );
+ m_labelSubProcessedSize->setText( i18n("%1 of %2 MB").tqarg(processedTrackSize).tqarg(trackSize) );
}
@@ -515,10 +515,10 @@ void K3bJobProgressDialog::slotUpdateTime()
{
int elapsed = m_startTime.secsTo( TQTime::currentTime() );
- TQString s = i18n("Elapsed time: %1 h").arg( TQTime().addSecs(elapsed).toString() );
+ TQString s = i18n("Elapsed time: %1 h").tqarg( TQTime().addSecs(elapsed).toString() );
if( d->lastProgress > 0 && d->lastProgress < 100 ) {
int rem = m_startTime.secsTo( m_lastProgressUpdateTime ) * (100-d->lastProgress) / d->lastProgress;
- s += " / " + i18n("Remaining: %1 h").arg( TQTime().addSecs(rem).toString() );
+ s += " / " + i18n("Remaining: %1 h").tqarg( TQTime().addSecs(rem).toString() );
}
m_labelElapsedTime->setText( s );
@@ -546,10 +546,10 @@ void K3bJobProgressDialog::slotProgress( int percent )
d->lastProgress = percent;
m_lastProgressUpdateTime = TQTime::currentTime();
if( KMainWindow* w = dynamic_cast<KMainWindow*>(kapp->mainWidget()) ) {
- w->setPlainCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_plainCaption) );
+ w->setPlainCaption( TQString( "(%1%) %2" ).tqarg(percent).tqarg(m_plainCaption) );
}
- setCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_job->jobDescription()) );
+ setCaption( TQString( "(%1%) %2" ).tqarg(percent).tqarg(m_job->jobDescription()) );
}
}
@@ -579,9 +579,9 @@ void K3bJobProgressDialog::keyPressEvent( TQKeyEvent *e )
}
-TQSize K3bJobProgressDialog::sizeHint() const
+TQSize K3bJobProgressDialog::tqsizeHint() const
{
- TQSize s = layout()->totalSizeHint();
+ TQSize s = tqlayout()->totalSizeHint();
if( s.width() < s.height() )
s.setWidth( s.height() );
return s;
diff --git a/src/k3bjobprogressdialog.h b/src/k3bjobprogressdialog.h
index 18b605c..e0f33ea 100644
--- a/src/k3bjobprogressdialog.h
+++ b/src/k3bjobprogressdialog.h
@@ -79,7 +79,7 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler
*/
int startJob( K3bJob* job = 0 );
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
/**
* @reimplemented from K3bJobHandler
diff --git a/src/k3blsofwrapperdialog.cpp b/src/k3blsofwrapperdialog.cpp
index 6ffc6f5..d7d1cb4 100644
--- a/src/k3blsofwrapperdialog.cpp
+++ b/src/k3blsofwrapperdialog.cpp
@@ -79,9 +79,9 @@ bool K3bLsofWrapperDialog::slotCheckDevice()
"<p><em>Hint: Sometimes shutting down an application does not "
"happen instantly. In that case you might have to use the '%3' "
"button.")
- .arg( m_device->vendor() + " - " + m_device->description() )
- .arg( joinProcessNames(apps) )
- .arg( actionButton( User2 )->text() ) );
+ .tqarg( m_device->vendor() + " - " + m_device->description() )
+ .tqarg( joinProcessNames(apps) )
+ .tqarg( actionButton( User2 )->text() ) );
return true;
}
}
diff --git a/src/k3bmediacontentsview.cpp b/src/k3bmediacontentsview.cpp
index dd3a804..69c57fa 100644
--- a/src/k3bmediacontentsview.cpp
+++ b/src/k3bmediacontentsview.cpp
@@ -19,7 +19,7 @@
#include <k3bapplication.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqwidgetstack.h>
diff --git a/src/k3bmediaselectioncombobox.cpp b/src/k3bmediaselectioncombobox.cpp
index 738e44f..666b268 100644
--- a/src/k3bmediaselectioncombobox.cpp
+++ b/src/k3bmediaselectioncombobox.cpp
@@ -64,7 +64,7 @@ void K3bMediaSelectionComboBox::ToolTip::maybeTip( const TQPoint& pos )
int index = m_box->listBox()->index( item );
if( K3bDevice::Device* dev = m_box->deviceAt( index ) ) {
- tip( m_box->listBox()->itemRect( item ),
+ tip( m_box->listBox()->tqitemRect( item ),
m_box->mediumToolTip( k3bappcore->mediaCache()->medium( dev ) ) );
}
}
@@ -350,7 +350,7 @@ void K3bMediaSelectionComboBox::addMedium( K3bDevice::Device* dev )
//
// insert the modified string
//
- insertItem( s + TQString(" (%1 - %2)").arg(dev->vendor()).arg(dev->description()) );
+ insertItem( s + TQString(" (%1 - %2)").tqarg(dev->vendor()).tqarg(dev->description()) );
//
// change the already existing string if we did not already do so
@@ -358,7 +358,7 @@ void K3bMediaSelectionComboBox::addMedium( K3bDevice::Device* dev )
//
int prevIndex = d->mediaStringMap[s];
if( prevIndex >= 0 )
- changeItem( text(prevIndex) + TQString(" (%1 - %2)").arg(d->devices[prevIndex]->vendor()).arg(d->devices[prevIndex]->description()),
+ changeItem( text(prevIndex) + TQString(" (%1 - %2)").tqarg(d->devices[prevIndex]->vendor()).tqarg(d->devices[prevIndex]->description()),
prevIndex );
//
@@ -478,11 +478,11 @@ TQString K3bMediaSelectionComboBox::noMediumMessage() const
mediumString = i18n("DVD");
else if( (d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD) &&
(d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD) )
- mediumString = i18n("CD-R(W) or DVD%1R(W)").arg("");
+ mediumString = i18n("CD-R(W) or DVD%1R(W)").tqarg("");
else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_SL )
- mediumString = i18n("DVD%1R(W)").arg("");
+ mediumString = i18n("DVD%1R(W)").tqarg("");
else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_DL )
- mediumString = i18n("Double Layer DVD%1R").arg("");
+ mediumString = i18n("Double Layer DVD%1R").tqarg("");
else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD )
mediumString = i18n("CD-R(W)");
else if( d->wantedMediumType & K3bDevice::MEDIA_DVD_ROM )
@@ -490,7 +490,7 @@ TQString K3bMediaSelectionComboBox::noMediumMessage() const
else
mediumString = i18n("CD-ROM");
- return i18n("Please insert %1...").arg( stateString.arg( mediumString ) );
+ return i18n("Please insert %1...").tqarg( stateString.tqarg( mediumString ) );
}
diff --git a/src/k3bmediaselectiondialog.cpp b/src/k3bmediaselectiondialog.cpp
index b9856fb..7e1bf63 100644
--- a/src/k3bmediaselectiondialog.cpp
+++ b/src/k3bmediaselectiondialog.cpp
@@ -20,7 +20,7 @@
#include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/src/k3bmedium.cpp b/src/k3bmedium.cpp
index e3cf946..9795cfd 100644
--- a/src/k3bmedium.cpp
+++ b/src/k3bmedium.cpp
@@ -292,7 +292,7 @@ TQString K3bMedium::shortString( bool useContent ) const
}
else if( diskInfo().diskState() == K3bDevice::STATE_EMPTY ) {
- return i18n("Empty %1 medium").arg( mediaTypeString );
+ return i18n("Empty %1 medium").tqarg( mediaTypeString );
}
else {
@@ -302,39 +302,39 @@ TQString K3bMedium::shortString( bool useContent ) const
toc().contentType() == K3bDevice::MIXED ) {
if( !cdText().performer().isEmpty() || !cdText().title().isEmpty() ) {
return TQString("%1 - %2 (%3)")
- .arg( cdText().performer() )
- .arg( cdText().title() )
- .arg( toc().contentType() == K3bDevice::AUDIO ? i18n("Audio CD") : i18n("Mixed CD") );
+ .tqarg( cdText().performer() )
+ .tqarg( cdText().title() )
+ .tqarg( toc().contentType() == K3bDevice::AUDIO ? i18n("Audio CD") : i18n("Mixed CD") );
}
else if( toc().contentType() == K3bDevice::AUDIO ) {
return i18n("Audio CD");
}
else {
- return i18n("%1 (Mixed CD)").arg( beautifiedVolumeId() );
+ return i18n("%1 (Mixed CD)").tqarg( beautifiedVolumeId() );
}
}
// DATA CD and DVD
else if( !volumeId().isEmpty() ) {
if( content() & CONTENT_VIDEO_DVD ) {
- return TQString("%1 (%2)").arg( beautifiedVolumeId() ).arg( i18n("Video DVD") );
+ return TQString("%1 (%2)").tqarg( beautifiedVolumeId() ).tqarg( i18n("Video DVD") );
}
else if( content() & CONTENT_VIDEO_CD ) {
- return TQString("%1 (%2)").arg( beautifiedVolumeId() ).arg( i18n("Video CD") );
+ return TQString("%1 (%2)").tqarg( beautifiedVolumeId() ).tqarg( i18n("Video CD") );
}
else if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
- return i18n("%1 (Appendable Data %2)").arg( beautifiedVolumeId(), mediaTypeString );
+ return i18n("%1 (Appendable Data %2)").tqarg( beautifiedVolumeId(), mediaTypeString );
}
else {
- return i18n("%1 (Complete Data %2)").arg( beautifiedVolumeId(), mediaTypeString );
+ return i18n("%1 (Complete Data %2)").tqarg( beautifiedVolumeId(), mediaTypeString );
}
}
else {
if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
- return i18n("Appendable Data %1").arg( mediaTypeString );
+ return i18n("Appendable Data %1").tqarg( mediaTypeString );
}
else {
- return i18n("Complete Data %1").arg( mediaTypeString );
+ return i18n("Complete Data %1").tqarg( mediaTypeString );
}
}
}
@@ -342,10 +342,10 @@ TQString K3bMedium::shortString( bool useContent ) const
// without content
else {
if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
- return i18n("Appendable %1 medium").arg( mediaTypeString );
+ return i18n("Appendable %1 medium").tqarg( mediaTypeString );
}
else {
- return i18n("Complete %1 medium").arg( mediaTypeString );
+ return i18n("Complete %1 medium").tqarg( mediaTypeString );
}
}
}
@@ -356,15 +356,15 @@ TQString K3bMedium::longString() const
{
TQString s = TQString("<p><nobr><b>%1 %2</b> (%3)</nobr>"
"<p>")
- .arg( d->device->vendor() )
- .arg( d->device->description() )
- .arg( d->device->blockDeviceName() )
+ .tqarg( d->device->vendor() )
+ .tqarg( d->device->description() )
+ .tqarg( d->device->blockDeviceName() )
+ shortString( true );
if( diskInfo().diskState() == K3bDevice::STATE_COMPLETE ||
diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
s += "<br>" + i18n("%1 in %n track", "%1 in %n tracks", toc().count() )
- .arg( KIO::convertSize(diskInfo().size().mode1Bytes() ) );
+ .tqarg( KIO::convertSize(diskInfo().size().mode1Bytes() ) );
if( diskInfo().numSessions() > 1 )
s += i18n(" and %n session", " and %n sessions", diskInfo().numSessions() );
}
@@ -372,11 +372,11 @@ TQString K3bMedium::longString() const
if( diskInfo().diskState() == K3bDevice::STATE_EMPTY ||
diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE )
s += "<br>" + i18n("Free space: %1")
- .arg( KIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) );
+ .tqarg( KIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) );
if( !diskInfo().empty() && diskInfo().rewritable() )
s += "<br>" + i18n("Capacity: %1")
- .arg( KIO::convertSize( diskInfo().capacity().mode1Bytes() ) );
+ .tqarg( KIO::convertSize( diskInfo().capacity().mode1Bytes() ) );
return s;
}
@@ -411,7 +411,7 @@ TQString K3bMedium::beautifiedVolumeId() const
return oldId;
// replace underscore with space
- else if( c.unicode() == 95 ) {
+ else if( c.tqunicode() == 95 ) {
newId.append( ' ' );
newWord = true;
}
diff --git a/src/k3bminibutton.cpp b/src/k3bminibutton.cpp
index b20399d..7d425d5 100644
--- a/src/k3bminibutton.cpp
+++ b/src/k3bminibutton.cpp
@@ -37,7 +37,7 @@ K3bMiniButton::~K3bMiniButton()
void K3bMiniButton::drawButton( TQPainter* p )
{
- p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
+ p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
if( m_mouseOver && !isDown() ){
p->setPen( white );
@@ -45,12 +45,12 @@ void K3bMiniButton::drawButton( TQPainter* p )
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
- p->setPen( colorGroup().dark() );
+ p->setPen( tqcolorGroup().dark() );
p->lineTo( width() - 1, height() - 1 );
p->lineTo( 0, height() - 1 );
}
if( isOn() || isDown() ){
- p->setPen( colorGroup().dark() );
+ p->setPen( tqcolorGroup().dark() );
p->moveTo( 0, height() - 1 );
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
@@ -64,14 +64,14 @@ void K3bMiniButton::drawButton( TQPainter* p )
void K3bMiniButton::enterEvent( TQEvent * )
{
m_mouseOver = true;
- repaint();
+ tqrepaint();
}
void K3bMiniButton::leaveEvent( TQEvent * )
{
m_mouseOver = false;
- repaint();
+ tqrepaint();
}
#include "k3bminibutton.moc"
diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp
index 45a9201..550e7b4 100644
--- a/src/k3bpassivepopup.cpp
+++ b/src/k3bpassivepopup.cpp
@@ -29,7 +29,7 @@
#include <kactivelabel.h>
#include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqmainwindow.h>
#include <tqmessagebox.h>
@@ -116,7 +116,7 @@ K3bPassivePopup::K3bPassivePopup( TQWidget* parent )
d->titleLabel = new TQLabel( this );
d->titleLabel->setMargin( 5 );
- d->titleLabel->setAlignment( TQt::AlignCenter );
+ d->titleLabel->tqsetAlignment( TQt::AlignCenter );
TQFont fnt( d->titleLabel->font() );
fnt.setBold( true );
d->titleLabel->setFont( fnt );
@@ -124,7 +124,7 @@ K3bPassivePopup::K3bPassivePopup( TQWidget* parent )
d->messageLabel = new KActiveLabel( this );
d->pixmapLabel = new TQLabel( this );
- d->pixmapLabel->setAlignment( TQt::AlignTop );
+ d->pixmapLabel->tqsetAlignment( TQt::AlignTop );
d->timeoutWidget = new K3bTimeoutWidget( this );
connect( d->timeoutWidget, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClose()) );
diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp
index 7678713..93a51d4 100644
--- a/src/k3bprojectmanager.cpp
+++ b/src/k3bprojectmanager.cpp
@@ -40,7 +40,7 @@
#include <tqptrlist.h>
#include <tqmap.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqdom.h>
#include <tqfile.h>
#include <tqapplication.h>
@@ -199,49 +199,49 @@ K3bDoc* K3bProjectManager::createEmptyProject( K3bDoc::DocType type )
switch( type ) {
case K3bDoc::AUDIO: {
doc = new K3bAudioDoc( this );
- fileName = i18n("AudioCD%1").arg(d->audioUntitledCount++);
+ fileName = i18n("AudioCD%1").tqarg(d->audioUntitledCount++);
break;
}
case K3bDoc::DATA: {
doc = new K3bDataDoc( this );
- fileName = i18n("DataCD%1").arg(d->dataUntitledCount++);
+ fileName = i18n("DataCD%1").tqarg(d->dataUntitledCount++);
break;
}
case K3bDoc::MIXED: {
doc = new K3bMixedDoc( this );
- fileName=i18n("MixedCD%1").arg(d->mixedUntitledCount++);
+ fileName=i18n("MixedCD%1").tqarg(d->mixedUntitledCount++);
break;
}
case K3bDoc::VCD: {
doc = new K3bVcdDoc( this );
- fileName=i18n("VideoCD%1").arg(d->vcdUntitledCount++);
+ fileName=i18n("VideoCD%1").tqarg(d->vcdUntitledCount++);
break;
}
case K3bDoc::MOVIX: {
doc = new K3bMovixDoc( this );
- fileName=i18n("eMovixCD%1").arg(d->movixUntitledCount++);
+ fileName=i18n("eMovixCD%1").tqarg(d->movixUntitledCount++);
break;
}
case K3bDoc::MOVIX_DVD: {
doc = new K3bMovixDvdDoc( this );
- fileName=i18n("eMovixDVD%1").arg(d->movixDvdUntitledCount++);
+ fileName=i18n("eMovixDVD%1").tqarg(d->movixDvdUntitledCount++);
break;
}
case K3bDoc::DVD: {
doc = new K3bDvdDoc( this );
- fileName = i18n("DataDVD%1").arg(d->dvdUntitledCount++);
+ fileName = i18n("DataDVD%1").tqarg(d->dvdUntitledCount++);
break;
}
case K3bDoc::VIDEODVD: {
doc = new K3bVideoDvdDoc( this );
- fileName = i18n("VideoDVD%1").arg(d->videoDvdUntitledCount++);
+ fileName = i18n("VideoDVD%1").tqarg(d->videoDvdUntitledCount++);
break;
}
}
diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp
index a138d03..3ef831d 100644
--- a/src/k3bsidepanel.cpp
+++ b/src/k3bsidepanel.cpp
@@ -23,7 +23,7 @@
#include <tqtoolbutton.h>
#include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
@@ -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->layout();
+ TQGridLayout* grid = (TQGridLayout*)cdProjectsFrame->tqlayout();
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->layout();
+ grid = (TQGridLayout*)dvdProjectsFrame->tqlayout();
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->layout());
+ TQGridLayout* grid = (TQGridLayout*)(frame->tqlayout());
grid->addWidget( b, grid->numRows(), 0 );
}
else
diff --git a/src/k3bsplash.cpp b/src/k3bsplash.cpp
index bfe7b15..5966eed 100644
--- a/src/k3bsplash.cpp
+++ b/src/k3bsplash.cpp
@@ -47,7 +47,7 @@ K3bSplash::K3bSplash( TQWidget* parent, const char* name )
copyrightLabel->setMargin( 5 );
copyrightLabel->setPaletteBackgroundColor( black );
copyrightLabel->setPaletteForegroundColor( white );
- copyrightLabel->setAlignment( AlignRight );
+ copyrightLabel->tqsetAlignment( AlignRight );
TQLabel* picLabel = new TQLabel( this );
if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
@@ -60,9 +60,9 @@ K3bSplash::K3bSplash( TQWidget* parent, const char* name )
m_infoBox->setPaletteBackgroundColor( black );
m_infoBox->setPaletteForegroundColor( white );
- // Set geometry, with support for Xinerama systems
+ // Set tqgeometry, with support for Xinerama systems
TQRect r;
- r.setSize(sizeHint());
+ r.setSize(tqsizeHint());
int ps = TQApplication::desktop()->primaryScreen();
r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
setGeometry(r);
@@ -108,7 +108,7 @@ void K3bSplash::addInfo( const TQString& s )
// TQFontMetrics fm = p.fontMetrics();
-// TQString line1 = TQString( "K3b version %1" ).arg(VERSION);
+// TQString line1 = TQString( "K3b version %1" ).tqarg(VERSION);
// TQString line2( "(c) 2001 by Sebastian Trueg" );
// TQString line3( "licenced under the GPL" );
@@ -122,7 +122,7 @@ void K3bSplash::addInfo( const TQString& s )
// int startX = 10;
// int startY = height() - 10 - textH;
-// p.drawText( startX, startY, textW, textH, 0, TQString("%1\n%2\n%3").arg(line1).arg(line2).arg(line3) );
+// p.drawText( startX, startY, textW, textH, 0, TQString("%1\n%2\n%3").tqarg(line1).tqarg(line2).tqarg(line3) );
// }
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index 0d88798..375a3d5 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -66,7 +66,7 @@ K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent )
m_labelInfoMessage = new TQLabel( " ", m_mainWindow->statusBar() );
// setup version info
- m_versionBox = new TQLabel( TQString("K3b %1").arg(kapp->aboutData()->version()), m_mainWindow->statusBar() );
+ m_versionBox = new TQLabel( TQString("K3b %1").tqarg(kapp->aboutData()->version()), m_mainWindow->statusBar() );
m_versionBox->installEventFilter( this );
// setup the statusbar
@@ -167,7 +167,7 @@ bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e )
static TQString dataDocStats( K3bDataDoc* dataDoc )
{
return i18n("1 file in %1", "%n files in %1", dataDoc->root()->numFiles() )
- .arg( i18n("1 folder", "%n folders", dataDoc->root()->numDirs()+1 ) );
+ .tqarg( i18n("1 folder", "%n folders", dataDoc->root()->numDirs()+1 ) );
}
@@ -199,7 +199,7 @@ void K3bStatusBarManager::slotUpdateProjectStats()
case K3bDoc::DATA: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("Data CD (%1)").arg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("Data CD (%1)").tqarg(dataDocStats(dataDoc)) );
break;
}
@@ -207,7 +207,7 @@ void K3bStatusBarManager::slotUpdateProjectStats()
K3bAudioDoc* audioDoc = static_cast<K3bMixedDoc*>( doc )->audioDoc();
K3bDataDoc* dataDoc = static_cast<K3bMixedDoc*>( doc )->dataDoc();
m_labelProjectInfo->setText( i18n("Mixed CD (1 track and %1)", "Mixed CD (%n tracks and %1)", audioDoc->numOfTracks() )
- .arg( dataDocStats(dataDoc)) );
+ .tqarg( dataDocStats(dataDoc)) );
break;
}
@@ -219,25 +219,25 @@ void K3bStatusBarManager::slotUpdateProjectStats()
case K3bDoc::MOVIX: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("eMovix CD (%1)").arg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("eMovix CD (%1)").tqarg(dataDocStats(dataDoc)) );
break;
}
case K3bDoc::MOVIX_DVD: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("eMovix DVD (%1)").arg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("eMovix DVD (%1)").tqarg(dataDocStats(dataDoc)) );
break;
}
case K3bDoc::DVD: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("Data DVD (%1)").arg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("Data DVD (%1)").tqarg(dataDocStats(dataDoc)) );
break;
}
case K3bDoc::VIDEODVD: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("Video DVD (%1)").arg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("Video DVD (%1)").tqarg(dataDocStats(dataDoc)) );
break;
}
}
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index fd75186..1cd97a1 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -36,7 +36,7 @@
#include <tqpushbutton.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqfileinfo.h>
@@ -108,7 +108,7 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const TQValueList<K3bSystemProbl
view->setTextFormat(RichText);
- // layout everything
+ // tqlayout everything
TQGridLayout* grid = new TQGridLayout( this );
grid->setMargin( marginHint() );
grid->setSpacing( spacingHint() );
@@ -186,7 +186,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
// 1. cdrecord, cdrdao
if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Unable to find %1 executable").arg("cdrecord"),
+ i18n("Unable to find %1 executable").tqarg("cdrecord"),
i18n("K3b uses cdrecord to actually write CDs."),
i18n("Install the cdrtools package which contains "
"cdrecord."),
@@ -195,7 +195,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
else {
if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "outdated" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
- i18n("Used %1 version %2 is outdated").arg("cdrecord").arg(k3bcore->externalBinManager()->binObject( "cdrecord" )->version),
+ i18n("Used %1 version %2 is outdated").tqarg("cdrecord").tqarg(k3bcore->externalBinManager()->binObject( "cdrecord" )->version),
i18n("Although K3b supports all cdrtools versions since "
"1.10 it is highly recommended to at least use "
"version 2.0."),
@@ -217,16 +217,16 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
!k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "wodim" ) ) {
if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("%1 will be run with root privileges on kernel >= 2.6.8").arg("cdrecord <= 2.01.01a05"),
+ i18n("%1 will be run with root privileges on kernel >= 2.6.8").tqarg("cdrecord <= 2.01.01a05"),
i18n("Since Linux kernel 2.6.8 %1 will not work when run suid "
- "root for security reasons anymore.").arg("cdrecord <= 2.01.01a05"),
+ "root for security reasons anymore.").tqarg("cdrecord <= 2.01.01a05"),
TQString(),
true ) );
}
#ifdef CDRECORD_SUID_ROOT_CHECK
else if( !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) && getuid() != 0 ) // not root
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("%1 will be run without root privileges").arg("cdrecord"),
+ i18n("%1 will be run without root privileges").tqarg("cdrecord"),
i18n("It is highly recommended to configure cdrecord "
"to run with root privileges. Only then cdrecord "
"runs with high priority which increases the overall "
@@ -242,7 +242,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
}
if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Unable to find %1 executable").arg("cdrdao"),
+ i18n("Unable to find %1 executable").tqarg("cdrdao"),
i18n("K3b uses cdrdao to actually write CDs."),
i18n("Install the cdrdao package."),
false ) );
@@ -253,7 +253,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
#ifdef CDRECORD_SUID_ROOT_CHECK
if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "suidroot" ) && getuid() != 0 )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("%1 will be run without root privileges").arg("cdrdao"),
+ i18n("%1 will be run without root privileges").tqarg("cdrdao"),
i18n("It is highly recommended to configure cdrdao "
"to run with root privileges to increase the "
"overall stability of the burning process."),
@@ -268,7 +268,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) {
if( !k3bcore->externalBinManager()->foundBin( "growisofs" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Unable to find %1 executable").arg("growisofs"),
+ i18n("Unable to find %1 executable").tqarg("growisofs"),
i18n("K3b uses growisofs to actually write dvds. "
"Without growisofs you will not be able to write dvds. "
"Make sure to install at least version 5.10."),
@@ -278,34 +278,34 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
else {
if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 10 ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
+ i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("K3b needs at least growisofs version 5.10 to write dvds. "
"All older versions will not work and K3b will refuse to use them."),
- i18n("Install a more recent version of %1.").arg("growisofs"),
+ i18n("Install a more recent version of %1.").tqarg("growisofs"),
false ) );
}
else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
- i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
+ i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("K3b will not be able to copy DVDs on-the-fly or write a DVD+RW in multiple "
"sessions using a growisofs "
"version older than 5.12."),
- i18n("Install a more recent version of %1.").arg("growisofs"),
+ i18n("Install a more recent version of %1.").tqarg("growisofs"),
false ) );
}
else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 7, 0 ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
- i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
+ i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("It is highly recommended to use growisofs 7.0 or higher. "
"K3b won't be able to write a DVD+RW in multiple "
"sessions using a growisofs version older than 7.0." ),
- i18n("Install a more recent version of %1.").arg("growisofs"),
+ i18n("Install a more recent version of %1.").tqarg("growisofs"),
false ) );
}
// for now we ignore the suid root bit becasue of the memorylocked issue
// else if( !k3bcore->externalBinManager()->binObject( "growisofs" )->hasFeature( "suidroot" ) ) {
// problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
-// i18n("%1 will be run without root privileges").arg("growisofs"),
+// i18n("%1 will be run without root privileges").tqarg("growisofs"),
// i18n("It is highly recommended to configure growisofs "
// "to run with root privileges. Only then growisofs "
// "runs with high priority which increases the overall "
@@ -317,7 +317,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( !k3bcore->externalBinManager()->foundBin( "dvd+rw-format" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Unable to find %1 executable").arg("dvd+rw-format"),
+ i18n("Unable to find %1 executable").tqarg("dvd+rw-format"),
i18n("K3b uses dvd+rw-format to format DVD-RWs and DVD+RWs."),
i18n("Install the dvd+rw-tools package."),
false ) );
@@ -330,11 +330,11 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
else if( k3bcore->externalBinManager()->binObject( "mkisofs" )->hasFeature( "outdated" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("Used %1 version %2 is outdated")
- .arg("mkisofs")
- .arg(k3bcore->externalBinManager()->binObject( "mkisofs" )->version),
+ .tqarg("mkisofs")
+ .tqarg(k3bcore->externalBinManager()->binObject( "mkisofs" )->version),
i18n("K3b needs at least mkisofs version 1.14. Older versions may introduce problems "
"when creating data projects."),
- i18n("Install a more recent version of %1.").arg("mkisofs"),
+ i18n("Install a more recent version of %1.").tqarg("mkisofs"),
false ) );
}
@@ -357,7 +357,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
it.current(); ++it ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
i18n("Device %1 - %2 is automounted.")
- .arg(it.current()->vendor()).arg(it.current()->description()),
+ .tqarg(it.current()->vendor()).tqarg(it.current()->description()),
i18n("K3b is not able to unmount automounted devices. Thus, especially "
"DVD+RW rewriting might fail. There is no need to report this as "
"a bug or feature wish; it is not possible to solve this problem "
@@ -394,16 +394,16 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
!( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "plain-atapi" ) &&
K3b::plainAtapiSupport() ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("%1 %2 does not support ATAPI").arg("cdrecord").arg(k3bcore->externalBinManager()->binObject("cdrecord")->version),
+ i18n("%1 %2 does not support ATAPI").tqarg("cdrecord").tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version),
i18n("The configured version of %1 does not "
"support writing to ATAPI devices without "
"SCSI emulation and there is at least one writer "
"in your system not configured to use "
- "SCSI emulation.").arg("cdrecord"),
+ "SCSI emulation.").tqarg("cdrecord"),
i18n("The best and recommended solution is to enable "
"ide-scsi (SCSI emulation) for all devices. "
"This way you won't have any problems. Or you install "
- "(or select as the default) a more recent version of %1.").arg("cdrtools"),
+ "(or select as the default) a more recent version of %1.").tqarg("cdrtools"),
false ) );
}
}
@@ -415,19 +415,19 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
// FIXME: replace ">" with "&gt;"
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("%1 %2 does not support ATAPI")
- .arg("cdrdao").arg(k3bcore->externalBinManager()->binObject("cdrdao")->version),
+ .tqarg("cdrdao").tqarg(k3bcore->externalBinManager()->binObject("cdrdao")->version),
i18n("The configured version of %1 does not "
"support writing to ATAPI devices without "
"SCSI emulation and there is at least one writer "
"in your system not configured to use "
- "SCSI emulation.").arg("cdrdao"),
+ "SCSI emulation.").tqarg("cdrdao"),
K3b::simpleKernelVersion() > K3bVersion( 2, 5, 0 )
? i18n("Install cdrdao >= 1.1.8 which supports writing to "
"ATAPI devices directly.")
: i18n("The best, and recommended, solution is to use "
"ide-scsi (SCSI emulation) for all writer devices: "
"this way you will not have any problems; or, you can install "
- "(or select as the default) a more recent version of %1.").arg("cdrdao"),
+ "(or select as the default) a more recent version of %1.").tqarg("cdrdao"),
false ) );
}
}
@@ -437,7 +437,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( dvd_r_dl && k3bcore->externalBinManager()->foundBin( "growisofs" ) ) {
if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 6, 0 ) )
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
- i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
+ i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("K3b won't be able to write DVD-R Dual Layer media using a growisofs "
"version older than 6.0."),
i18n("Install a more recent version of growisofs."),
@@ -450,31 +450,31 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( !TQFileInfo( dev->blockDeviceName() ).isWritable() )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("No write access to device %1").arg(dev->blockDeviceName()),
+ i18n("No write access to device %1").tqarg(dev->blockDeviceName()),
i18n("K3b needs write access to all the devices to perform certain tasks. "
- "Without it you might encounter problems with %1 - %2").arg(dev->vendor()).arg(dev->description()),
+ "Without it you might encounter problems with %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()),
i18n("Make sure you have write access to %1. In case you are not using "
- "devfs or udev K3bSetup is able to do this for you.").arg(dev->blockDeviceName()),
+ "devfs or udev K3bSetup is able to do this for you.").tqarg(dev->blockDeviceName()),
false ) );
if( !dev->genericDevice().isEmpty() &&
!TQFileInfo( dev->genericDevice() ).isWritable() )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("No write access to generic SCSI device %1").arg(dev->genericDevice()),
+ i18n("No write access to generic SCSI device %1").tqarg(dev->genericDevice()),
i18n("Without write access to the generic device you might "
- "encounter problems with Audio CD ripping from %1 - %2").arg(dev->vendor()).arg(dev->description()),
+ "encounter problems with Audio CD ripping from %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()),
i18n("Make sure you have write access to %1. In case you are not using "
- "devfs or udev K3bSetup is able to do this for you.").arg(dev->genericDevice()),
+ "devfs or udev K3bSetup is able to do this for you.").tqarg(dev->genericDevice()),
false ) );
if( dev->interfaceType() == K3bDevice::IDE && !dmaActivated( dev ) )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("DMA disabled on device %1 - %2").arg(dev->vendor()).arg(dev->description()),
+ i18n("DMA disabled on device %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()),
i18n("With most modern CD/DVD devices enabling DMA highly increases "
"read/write performance. If you experience very low writing speeds "
"this is probably the cause."),
- i18n("Enable DMA temporarily as root with 'hdparm -d 1 %1'.").arg(dev->blockDeviceName()) ) );
+ i18n("Enable DMA temporarily as root with 'hdparm -d 1 %1'.").tqarg(dev->blockDeviceName()) ) );
}
@@ -487,13 +487,13 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
const K3bExternalProgram* p = it.data();
if( !p->userParameters().isEmpty() ) {
problems.append( K3bSystemProblem( K3bSystemProblem::WARNING,
- i18n("User parameters specified for external program %1").arg(p->name()),
+ i18n("User parameters specified for external program %1").tqarg(p->name()),
i18n("Sometimes it may be nessessary to specify user parameters in addition to "
"the parameters generated by K3b. This is simply a warning to make sure that "
"these parameters are really wanted and won't be part of some bug report."),
i18n("To remove the user parameters for the external program %1 open the "
"K3b settings page 'Programs' and choose the tab 'User Parameters'.")
- .arg(p->name()),
+ .tqarg(p->name()),
false ) );
}
}
diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp
index 2f64d23..375c870 100644
--- a/src/k3btempdirselectionwidget.cpp
+++ b/src/k3btempdirselectionwidget.cpp
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <tqhbox.h>
#include <tqtooltip.h>
@@ -44,8 +44,8 @@ K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *parent, const ch
m_labelCdSize(0),
m_defaultImageFileName( "k3b_image.iso" )
{
- layout()->setSpacing( KDialog::spacingHint() );
- layout()->setMargin( KDialog::marginHint() );
+ tqlayout()->setSpacing( KDialog::spacingHint() );
+ tqlayout()->setMargin( KDialog::marginHint() );
m_imageFileLabel = new TQLabel( this );
m_editDirectory = new KURLRequester( this, "m_editDirectory" );
@@ -56,7 +56,7 @@ K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *parent, const ch
freeTempSpaceBox->setSpacing( KDialog::spacingHint() );
(void)new TQLabel( i18n( "Free space in temporary directory:" ), freeTempSpaceBox, "TextLabel2" );
m_labelFreeSpace = new TQLabel( " ",freeTempSpaceBox, "m_labelFreeSpace" );
- m_labelFreeSpace->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
connect( m_editDirectory, TQT_SIGNAL(openFileDialog(KURLRequester*)),
@@ -212,7 +212,7 @@ void K3bTempDirSelectionWidget::setNeededSize( KIO::filesize_t bytes )
cdSizeBox->setSpacing( KDialog::spacingHint() );
(void)new TQLabel( i18n( "Size of project:" ), cdSizeBox, "TextLabel4" );
m_labelCdSize = new TQLabel( KIO::convertSize(bytes), cdSizeBox, "m_labelCdSize" );
- m_labelCdSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelCdSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
}
m_labelCdSize->setText( KIO::convertSize(bytes) );
}
diff --git a/src/k3bthemedheader.cpp b/src/k3bthemedheader.cpp
index 0a0dc01..45796db 100644
--- a/src/k3bthemedheader.cpp
+++ b/src/k3bthemedheader.cpp
@@ -20,7 +20,7 @@
#include <k3btitlelabel.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
K3bThemedHeader::K3bThemedHeader( TQWidget* parent )
@@ -71,9 +71,9 @@ void K3bThemedHeader::setRightPixmap( K3bTheme::PixmapType p )
}
-void K3bThemedHeader::setAlignment( int align )
+void K3bThemedHeader::tqsetAlignment( int align )
{
- m_titleLabel->setAlignment( align );
+ m_titleLabel->tqsetAlignment( align );
}
@@ -84,9 +84,9 @@ void K3bThemedHeader::init()
setLineWidth( 1 );
setMargin( 1 );
- TQHBoxLayout* layout = new TQHBoxLayout( this );
- layout->setMargin( 2 ); // to make sure the frame gets displayed
- layout->setSpacing( 0 );
+ TQHBoxLayout* tqlayout = new TQHBoxLayout( this );
+ tqlayout->setMargin( 2 ); // to make sure the frame gets displayed
+ tqlayout->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 );
- layout->addWidget( m_leftLabel );
- layout->addWidget( m_titleLabel );
- layout->setStretchFactor( m_titleLabel, 1 );
- layout->addWidget( m_rightLabel );
+ tqlayout->addWidget( m_leftLabel );
+ tqlayout->addWidget( m_titleLabel );
+ tqlayout->setStretchFactor( m_titleLabel, 1 );
+ tqlayout->addWidget( m_rightLabel );
m_leftPix = K3bTheme::DIALOG_LEFT;
m_rightPix = K3bTheme::DIALOG_RIGHT;
diff --git a/src/k3bthemedheader.h b/src/k3bthemedheader.h
index e714020..e5f319b 100644
--- a/src/k3bthemedheader.h
+++ b/src/k3bthemedheader.h
@@ -36,7 +36,7 @@ class K3bThemedHeader : public TQFrame
public slots:
void setTitle( const TQString& title, const TQString& subtitle = TQString() );
void setSubTitle( const TQString& subtitle );
- void setAlignment( int );
+ void tqsetAlignment( int );
void setLeftPixmap( K3bTheme::PixmapType );
void setRightPixmap( K3bTheme::PixmapType );
diff --git a/src/k3btimeoutwidget.cpp b/src/k3btimeoutwidget.cpp
index f0a5d4a..ea89f20 100644
--- a/src/k3btimeoutwidget.cpp
+++ b/src/k3btimeoutwidget.cpp
@@ -88,13 +88,13 @@ void K3bTimeoutWidget::timeStep()
}
-TQSize K3bTimeoutWidget::sizeHint() const
+TQSize K3bTimeoutWidget::tqsizeHint() const
{
- return minimumSizeHint();
+ return tqminimumSizeHint();
}
-TQSize K3bTimeoutWidget::minimumSizeHint() const
+TQSize K3bTimeoutWidget::tqminimumSizeHint() const
{
int fw = fontMetrics().width( TQString::number( d->timeout/1000 ) );
int fh = fontMetrics().height();
@@ -128,7 +128,7 @@ void K3bTimeoutWidget::paintEvent( TQPaintEvent* )
}
TQRect r;
- r.setSize( minimumSizeHint() );
+ r.setSize( tqminimumSizeHint() );
r.moveCenter( rect().center() );
p.drawArc( r, 0, 360*16 );
diff --git a/src/k3btimeoutwidget.h b/src/k3btimeoutwidget.h
index 83c1f43..b7c7dae 100644
--- a/src/k3btimeoutwidget.h
+++ b/src/k3btimeoutwidget.h
@@ -31,8 +31,8 @@ class K3bTimeoutWidget : public TQWidget
K3bTimeoutWidget( TQWidget* parent );
~K3bTimeoutWidget();
- TQSize sizeHint() const;
- TQSize minimumSizeHint() const;
+ TQSize tqsizeHint() const;
+ TQSize tqminimumSizeHint() const;
public slots:
void setTimeout( int msecs );
diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp
index e0d39e0..161a8b8 100644
--- a/src/k3bwelcomewidget.cpp
+++ b/src/k3bwelcomewidget.cpp
@@ -86,7 +86,7 @@ K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* parent )
fnt.setPointSize( 16 );
m_header = new TQSimpleRichText( i18n("Welcome to K3b - The CD and DVD Kreator"), fnt );
m_infoText = new TQSimpleRichText( TQString::fromUtf8("<qt align=\"center\">K3b %1 (c) 1999 - 2007 Sebastian Trüg")
- .arg(kapp->aboutData()->version()), font() );
+ .tqarg(kapp->aboutData()->version()), font() );
// set a large width just to be sure no linebreak occurs
m_header->setWidth( 800 );
@@ -182,9 +182,9 @@ void K3bWelcomeWidget::Display::rebuildGui()
// determine the needed button size (since all buttons should be equal in size
// we use the max of all sizes)
- m_buttonSize = m_buttons.first()->sizeHint();
+ m_buttonSize = m_buttons.first()->tqsizeHint();
for( TQPtrListIterator<K3bFlatButton> it( m_buttons ); it.current(); ++it ) {
- m_buttonSize = m_buttonSize.expandedTo( it.current()->sizeHint() );
+ m_buttonSize = m_buttonSize.expandedTo( it.current()->tqsizeHint() );
}
repositionButtons();
@@ -249,7 +249,7 @@ int K3bWelcomeWidget::Display::heightForWidth( int w ) const
}
-TQSize K3bWelcomeWidget::Display::minimumSizeHint() const
+TQSize K3bWelcomeWidget::Display::tqminimumSizeHint() const
{
TQSize size( TQMAX(40+m_header->widthUsed(), 40+m_buttonSize.width()),
20 + m_header->height() + 20 + 10 + m_buttonSize.height() + 10 + m_infoText->height() + 20 );
@@ -309,7 +309,7 @@ void K3bWelcomeWidget::Display::paintEvent( TQPaintEvent* )
p.drawRect( 10, 10, width()-20, height()-20 );
// draw the header text
- TQColorGroup grp( colorGroup() );
+ TQColorGroup grp( tqcolorGroup() );
grp.setColor( TQColorGroup::Text, theme->foregroundColor() );
int pos = 20;
pos += TQMAX( (width()-40-m_header->widthUsed())/2, 0 );
@@ -415,7 +415,7 @@ void K3bWelcomeWidget::showEvent( TQShowEvent* e )
void K3bWelcomeWidget::fixSize()
{
TQSize s = contentsRect().size();
- s.setWidth( TQMAX( main->minimumSizeHint().width(), s.width() ) );
+ s.setWidth( TQMAX( main->tqminimumSizeHint().width(), s.width() ) );
s.setHeight( TQMAX( main->heightForWidth(s.width()), s.height() ) );
main->resize( s );
@@ -443,7 +443,7 @@ void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e )
int r = 0;
int removeAction = 0;
- TQWidget* widgetAtPos = viewport()->childAt(e->pos());
+ TQWidget* widgetAtPos = viewport()->tqchildAt(e->pos());
if( widgetAtPos && widgetAtPos->inherits( "K3bFlatButton" ) ) {
KPopupMenu pop;
removeAction = pop.insertItem( SmallIcon("remove"), i18n("Remove Button") );
diff --git a/src/k3bwelcomewidget.h b/src/k3bwelcomewidget.h
index 330ab4e..b40b3b3 100644
--- a/src/k3bwelcomewidget.h
+++ b/src/k3bwelcomewidget.h
@@ -76,7 +76,7 @@ class K3bWelcomeWidget::Display : public TQWidget
Display( K3bWelcomeWidget* parent );
~Display();
- TQSize minimumSizeHint() const;
+ TQSize tqminimumSizeHint() const;
TQSizePolicy sizePolicy () const;
int heightForWidth ( int w ) const;
diff --git a/src/k3bwidgetshoweffect.cpp b/src/k3bwidgetshoweffect.cpp
index e28aa39..1da951e 100644
--- a/src/k3bwidgetshoweffect.cpp
+++ b/src/k3bwidgetshoweffect.cpp
@@ -96,7 +96,7 @@ void K3bWidgetShowEffect::timerEvent( TQTimerEvent* )
void K3bWidgetShowEffect::dissolveMask()
{
if( m_bShow ) {
- m_widget->repaint( false );
+ m_widget->tqrepaint( false );
TQPainter maskPainter(&m_mask);
m_mask.fill(TQt::black);
diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp
index 874db31..a89593d 100644
--- a/src/k3bwriterselectionwidget.cpp
+++ b/src/k3bwriterselectionwidget.cpp
@@ -33,7 +33,7 @@
#include <kinputdialog.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqtooltip.h>
#include <tqtoolbutton.h>
@@ -121,11 +121,11 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char
TQGroupBox* groupWriter = new TQGroupBox( this );
groupWriter->setTitle( i18n( "Burn Medium" ) );
groupWriter->setColumnLayout(0, Qt::Vertical );
- groupWriter->layout()->setSpacing( 0 );
- groupWriter->layout()->setMargin( 0 );
+ groupWriter->tqlayout()->setSpacing( 0 );
+ groupWriter->tqlayout()->setMargin( 0 );
- TQGridLayout* groupWriterLayout = new TQGridLayout( groupWriter->layout() );
- groupWriterLayout->setAlignment( TQt::AlignTop );
+ TQGridLayout* groupWriterLayout = new TQGridLayout( groupWriter->tqlayout() );
+ groupWriterLayout->tqsetAlignment( TQt::AlignTop );
groupWriterLayout->setSpacing( KDialog::spacingHint() );
groupWriterLayout->setMargin( KDialog::marginHint() );
@@ -150,7 +150,7 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char
TQGridLayout* mainLayout = new TQGridLayout( this );
- mainLayout->setAlignment( TQt::AlignTop );
+ mainLayout->tqsetAlignment( TQt::AlignTop );
mainLayout->setSpacing( KDialog::spacingHint() );
mainLayout->setMargin( 0 );
@@ -332,7 +332,7 @@ void K3bWriterSelectionWidget::insertSpeedItem( int speed )
: TQString::number( speed/1385 ) )
+ "x" );
else
- m_comboSpeed->insertItem( TQString("%1x").arg(speed/175) );
+ m_comboSpeed->insertItem( TQString("%1x").tqarg(speed/175) );
}
}
diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp
index 9dc3ffc..69bacb7 100644
--- a/src/misc/k3bblankingdialog.cpp
+++ b/src/misc/k3bblankingdialog.cpp
@@ -37,8 +37,8 @@
#include <tqgroupbox.h>
#include <tqpushbutton.h>
#include <tqcheckbox.h>
-#include <layout.h>
-#include <textview.h>
+#include <tqlayout.h>
+#include <tqtextview.h>
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqheader.h>
@@ -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->layout()->setSpacing( spacingHint() );
- groupBlankType->layout()->setMargin( marginHint() );
+ groupBlankType->tqlayout()->setSpacing( spacingHint() );
+ groupBlankType->tqlayout()->setMargin( marginHint() );
m_comboEraseMode = new TQComboBox( groupBlankType );
// ----------------------------------------------------------------------
@@ -200,7 +200,7 @@ void K3bBlankingDialog::slotWriterChanged()
setButtonEnabled( START_BUTTON, true );
else {
setButtonEnabled( START_BUTTON, false );
- KMessageBox::sorry( this, i18n("%1 does not support CD-RW writing.").arg(dev->devicename()) );
+ KMessageBox::sorry( this, i18n("%1 does not support CD-RW writing.").tqarg(dev->devicename()) );
}
}
diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp
index 8b6209b..413e9ba 100644
--- a/src/misc/k3bcdcopydialog.cpp
+++ b/src/misc/k3bcdcopydialog.cpp
@@ -47,7 +47,7 @@
#include <tqcheckbox.h>
#include <tqspinbox.h>
#include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqptrlist.h>
#include <tqlabel.h>
@@ -295,7 +295,7 @@ void K3bCdCopyDialog::slotStartClicked()
//
if( TQFileInfo( m_tempDirSelectionWidget->tempPath() ).isFile() ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue )
return;
@@ -303,7 +303,7 @@ void K3bCdCopyDialog::slotStartClicked()
if( TQFileInfo( m_tempDirSelectionWidget->tempPath() + ".toc" ).isFile() ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath() + ".toc"),
+ i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath() + ".toc"),
i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue )
return;
diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp
index 52c912a..99f3849 100644
--- a/src/misc/k3bcdimagewritingdialog.cpp
+++ b/src/misc/k3bcdimagewritingdialog.cpp
@@ -60,7 +60,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqptrlist.h>
#include <tqfile.h>
#include <tqfileinfo.h>
@@ -74,7 +74,7 @@
#include <tqmap.h>
#include <tqptrqueue.h>
#include <tqpopupmenu.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
class K3bCdImageWritingDialog::Private
@@ -238,7 +238,7 @@ void K3bCdImageWritingDialog::setupGui()
TQWidget* optionTab = new TQWidget( d->optionTabbed );
TQGridLayout* optionTabLayout = new TQGridLayout( optionTab );
- optionTabLayout->setAlignment( TQt::AlignTop );
+ optionTabLayout->tqsetAlignment( TQt::AlignTop );
optionTabLayout->setSpacing( spacingHint() );
optionTabLayout->setMargin( marginHint() );
@@ -293,7 +293,7 @@ void K3bCdImageWritingDialog::setupGui()
// advanced ---------------------------------
d->advancedTab = new TQWidget( d->optionTabbed );
TQGridLayout* advancedTabLayout = new TQGridLayout( d->advancedTab );
- advancedTabLayout->setAlignment( TQt::AlignTop );
+ advancedTabLayout->tqsetAlignment( TQt::AlignTop );
advancedTabLayout->setSpacing( spacingHint() );
advancedTabLayout->setMargin( marginHint() );
@@ -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, palette().disabled().foreground() );
+ isoRootItem->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Preparer Id:"),
isoF->primaryDescriptor().preparerId.isEmpty()
? TQString("-") : isoF->primaryDescriptor().preparerId );
- item->setForegroundColor( 0, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ isoRootItem->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Image file:"),
imageFile );
- item->setForegroundColor( 0, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("TOC file:"),
tocFile );
- item->setForegroundColor( 0, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ isoRootItem->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Image file:"),
imageFile );
- item->setForegroundColor( 0, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Cue file:"),
cueFile );
- item->setForegroundColor( 0, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ rootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
rootItem->setPixmap( 0, SmallIcon( "sound") );
K3bListViewItem* trackParent = new K3bListViewItem( rootItem,
@@ -718,9 +718,9 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp )
if( !cp.cdText().isEmpty() )
trackParent->setText( 1,
TQString("%1 (%2 - %3)")
- .arg(trackParent->text(1))
- .arg(cp.cdText().performer())
- .arg(cp.cdText().title()) );
+ .tqarg(trackParent->text(1))
+ .tqarg(cp.cdText().performer())
+ .tqarg(cp.cdText().title()) );
unsigned int i = 1;
for( K3bDevice::Toc::const_iterator it = cp.toc().begin();
@@ -736,9 +736,9 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp )
if( !cp.cdText().isEmpty() && !cp.cdText()[i-1].isEmpty() )
trackItem->setText( 1,
TQString("%1 (%2 - %3)")
- .arg(trackItem->text(1))
- .arg(cp.cdText()[i-1].performer())
- .arg(cp.cdText()[i-1].title()) );
+ .tqarg(trackItem->text(1))
+ .tqarg(cp.cdText()[i-1].performer())
+ .tqarg(cp.cdText()[i-1].title()) );
++i;
}
@@ -816,7 +816,7 @@ void K3bCdImageWritingDialog::toggleAll()
item->setForegroundColor( 1,
currentImageType() != d->foundImageType
? TQt::red
- : m_infoView->colorGroup().foreground() );
+ : m_infoView->tqcolorGroup().foreground() );
}
@@ -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, palette().disabled().foreground() );
+ d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
d->md5SumItem->setProgress( 1, 0 );
d->md5SumItem->setPixmap( 0, SmallIcon( "exec") );
@@ -899,15 +899,15 @@ void K3bCdImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, cons
this );
if( ok ) {
if( md5sumToCompare.lower().utf8() == d->md5Job->hexDigest().lower() )
- KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").arg(imagePath()),
+ KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").tqarg(imagePath()),
i18n("MD5 Sums Equal") );
else
- KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").arg(imagePath()),
+ KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").tqarg(imagePath()),
i18n("MD5 Sums Differ") );
}
}
else if( r == copyItem ) {
- TQApplication::clipboard()->setText( d->md5Job->hexDigest().lower(), TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setText( d->md5Job->hexDigest().lower(), TQClipboard::Clipboard );
}
}
diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp
index 615e683..ff721b3 100644
--- a/src/misc/k3bdvdcopydialog.cpp
+++ b/src/misc/k3bdvdcopydialog.cpp
@@ -31,7 +31,7 @@
#include <k3bmediacache.h>
#include <k3biso9660.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
@@ -169,7 +169,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod
//
- // setup layout
+ // setup tqlayout
// //////////////////////////////////////////////////////////////////////////
TQGridLayout* grid = new TQGridLayout( w );
grid->setMargin( 0 );
diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp
index 661a243..a232479 100644
--- a/src/misc/k3bdvdformattingdialog.cpp
+++ b/src/misc/k3bdvdformattingdialog.cpp
@@ -30,7 +30,7 @@
#include <kapplication.h>
#include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqframe.h>
#include <tqpushbutton.h>
@@ -41,7 +41,7 @@
K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* name, bool modal )
: K3bInteractionDialog( parent, name,
i18n("DVD Formatting"),
- i18n("DVD%1RW").arg("�"),
+ i18n("DVD%1RW").tqarg("�"),
START_BUTTON|CANCEL_BUTTON,
START_BUTTON,
"DVD Formatting", // config group
@@ -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->layout()->setMargin( marginHint() );
- groupWritingMode->layout()->setSpacing( spacingHint() );
+ groupWritingMode->tqlayout()->setMargin( marginHint() );
+ groupWritingMode->tqlayout()->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->layout()->setMargin( marginHint() );
- groupOptions->layout()->setSpacing( spacingHint() );
+ groupOptions->tqlayout()->setMargin( marginHint() );
+ groupOptions->tqlayout()->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 e59f192..687fd1a 100644
--- a/src/misc/k3bisoimagewritingdialog.cpp
+++ b/src/misc/k3bisoimagewritingdialog.cpp
@@ -52,7 +52,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqpushbutton.h>
@@ -62,7 +62,7 @@
#include <tqspinbox.h>
#include <tqevent.h>
#include <tqpopupmenu.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
class K3bIsoImageWritingDialog::Private
@@ -181,7 +181,7 @@ void K3bIsoImageWritingDialog::setupGui()
TQWidget* optionTab = new TQWidget( optionTabbed );
TQGridLayout* optionTabLayout = new TQGridLayout( optionTab );
- optionTabLayout->setAlignment( TQt::AlignTop );
+ optionTabLayout->tqsetAlignment( TQt::AlignTop );
optionTabLayout->setSpacing( spacingHint() );
optionTabLayout->setMargin( marginHint() );
@@ -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, palette().disabled().foreground() );
+ isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"), KIO::convertSize( imageSize ) );
- item->setForegroundColor( 0, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Preparer Id:"),
isoF.primaryDescriptor().preparerId.isEmpty()
? TQString("-") : isoF.primaryDescriptor().preparerId );
- item->setForegroundColor( 0, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ item->setForegroundColor( 0, tqpalette().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, palette().disabled().foreground() );
+ d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
d->md5SumItem->setProgress( 1, 0 );
d->md5SumItem->setPixmap( 0, SmallIcon( "exec") );
@@ -501,15 +501,15 @@ void K3bIsoImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, con
this );
if( ok ) {
if( md5sumToCompare.lower().utf8() == m_md5Job->hexDigest().lower() )
- KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").arg(imagePath()),
+ KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").tqarg(imagePath()),
i18n("MD5 Sums Equal") );
else
- KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").arg(imagePath()),
+ KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").tqarg(imagePath()),
i18n("MD5 Sums Differ") );
}
}
else if( r == copyItem ) {
- TQApplication::clipboard()->setText( m_md5Job->hexDigest().lower(), TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setText( m_md5Job->hexDigest().lower(), TQClipboard::Clipboard );
}
}
diff --git a/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui
index 09cb8a8..6af30c6 100644
--- a/src/option/base_k3bcddboptiontab.ui
+++ b/src/option/base_k3bcddboptiontab.ui
@@ -195,7 +195,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>51</height>
@@ -394,7 +394,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -491,7 +491,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>151</height>
diff --git a/src/option/base_k3bmiscoptiontab.ui b/src/option/base_k3bmiscoptiontab.ui
index 89a20cf..f6a7114 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>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -202,7 +202,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -241,7 +241,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>0</height>
diff --git a/src/option/base_k3bpluginoptiontab.ui b/src/option/base_k3bpluginoptiontab.ui
index 1278f80..3d34bad 100644
--- a/src/option/base_k3bpluginoptiontab.ui
+++ b/src/option/base_k3bpluginoptiontab.ui
@@ -38,7 +38,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>411</width>
<height>21</height>
diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui
index cad57b1..78d9333 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>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -135,7 +135,7 @@
<property name="text">
<string>no Theme selected</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -153,7 +153,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>161</width>
<height>2</height>
diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp
index 4fa760d..18bc7be 100644
--- a/src/option/k3bburningoptiontab.cpp
+++ b/src/option/k3bburningoptiontab.cpp
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqtabwidget.h>
#include <tqradiobutton.h>
@@ -54,14 +54,14 @@ K3bBurningOptionTab::~K3bBurningOptionTab()
void K3bBurningOptionTab::setupGui()
{
TQGridLayout* groupAdvancedLayout = new TQGridLayout( this );
- groupAdvancedLayout->setAlignment( TQt::AlignTop );
+ groupAdvancedLayout->tqsetAlignment( TQt::AlignTop );
groupAdvancedLayout->setSpacing( KDialog::spacingHint() );
groupAdvancedLayout->setMargin( 0 );
TQGroupBox* groupWritingApp = new TQGroupBox( 0, Qt::Vertical, i18n("Burning"), this );
- groupWritingApp->layout()->setMargin( 0 );
- TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->layout() );
+ groupWritingApp->tqlayout()->setMargin( 0 );
+ TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->tqlayout() );
bufferLayout->setMargin( KDialog::marginHint() );
bufferLayout->setSpacing( KDialog::spacingHint() );
@@ -132,7 +132,7 @@ void K3bBurningOptionTab::setupGui()
"avoid gaps in the data stream due to high system load. The default "
"sizes used are %1 MB for CD and %2 MB for DVD burning."
"<p>If this option is checked the value specified will be used for both "
- "CD and DVD burning.").arg(4).arg(32) );
+ "CD and DVD burning.").tqarg(4).tqarg(32) );
TQWhatsThis::add( m_checkEject, i18n("<p>If this option is checked K3b will not eject the medium once the burn process "
"finishes. This can be helpful in case one leaves the computer after starting the "
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index 9493f8a..957f9fa 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -22,7 +22,7 @@
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqtabwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqstringlist.h>
@@ -50,20 +50,20 @@ K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* parent, const char* name )
base_K3bCddbOptionTabLayout->setMargin( 0 );
base_K3bCddbOptionTabLayout->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_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_groupLocalDir->layout()->setMargin( 0 );
+// m_groupLocalDir->tqlayout()->setMargin( 0 );
// m_groupLocalDirLayout->setMargin( KDialog::marginHint() );
// m_groupLocalDirLayout->setSpacing( KDialog::spacingHint() );
-// m_groupCddbServer->layout()->setMargin( 0 );
+// m_groupCddbServer->tqlayout()->setMargin( 0 );
// m_groupCddbServerLayout->setMargin( KDialog::marginHint() );
// m_groupCddbServerLayout->setSpacing( KDialog::spacingHint() );
- m_groupCgi->layout()->setMargin( 0 );
+ m_groupCgi->tqlayout()->setMargin( 0 );
m_groupCgiLayout->setMargin( KDialog::marginHint() );
m_groupCgiLayout->setSpacing( KDialog::spacingHint() );
diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp
index fede37c..c8517a5 100644
--- a/src/option/k3bdeviceoptiontab.cpp
+++ b/src/option/k3bdeviceoptiontab.cpp
@@ -21,7 +21,7 @@
#include <tqlabel.h>
#include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcursor.h>
#include <tqapplication.h>
@@ -43,7 +43,7 @@ K3bDeviceOptionTab::K3bDeviceOptionTab( TQWidget* parent, const char* name )
// Info Label
// ------------------------------------------------
m_labelDevicesInfo = new TQLabel( this, "m_labelDevicesInfo" );
- m_labelDevicesInfo->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
+ m_labelDevicesInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
m_labelDevicesInfo->setText( i18n( "K3b tries to detect all your devices properly. "
"You can add devices that have not been detected and change "
"the black values by clicking in the list. If K3b is unable "
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index 4dfd17e..d19e42a 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -33,7 +33,7 @@
#include <tqgroupbox.h>
#include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -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->layout()->setSpacing( KDialog::spacingHint() );
- groupDevices->layout()->setMargin( KDialog::marginHint() );
+ groupDevices->tqlayout()->setSpacing( KDialog::spacingHint() );
+ groupDevices->tqlayout()->setMargin( KDialog::marginHint() );
m_viewDevices = new K3bListView( groupDevices, "m_viewDevicesReader" );
m_viewDevices->addColumn( "V" );
@@ -254,30 +254,30 @@ void K3bDeviceWidget::updateDeviceListViews()
// create the read-only info items
K3bListViewItem* systemDeviceItem = new K3bListViewItem( devRoot, i18n("System device name:") );
if( dev->device->interfaceType() == K3bDevice::SCSI )
- systemDeviceItem->setText( 1, TQString("%1 (%2)").arg(dev->device->devicename()).arg(dev->device->busTargetLun()) );
+ systemDeviceItem->setText( 1, TQString("%1 (%2)").tqarg(dev->device->devicename()).tqarg(dev->device->busTargetLun()) );
else
systemDeviceItem->setText( 1, dev->device->devicename() );
- systemDeviceItem->setForegroundColor( 1, palette().disabled().foreground() );
+ systemDeviceItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
K3bListViewItem* interfaceItem = new K3bListViewItem( devRoot, systemDeviceItem,
i18n("Interface type:"),
( dev->device->interfaceType() == K3bDevice::SCSI ?
i18n("Generic SCSI") :
i18n("ATAPI") ) );
- interfaceItem->setForegroundColor( 1, palette().disabled().foreground() );
+ interfaceItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
K3bListViewItem* vendorItem = new K3bListViewItem( devRoot, interfaceItem,
i18n("Vendor:"),
dev->device->vendor() );
- vendorItem->setForegroundColor( 1, palette().disabled().foreground() );
+ vendorItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
K3bListViewItem* modelItem = new K3bListViewItem( devRoot, vendorItem,
i18n("Description:"),
dev->device->description() );
- modelItem->setForegroundColor( 1, palette().disabled().foreground() );
+ modelItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
K3bListViewItem* versionItem = new K3bListViewItem( devRoot, modelItem,
i18n("Firmware:"),
dev->device->version() );
- versionItem->setForegroundColor( 1, palette().disabled().foreground() );
+ versionItem->setForegroundColor( 1, tqpalette().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, palette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Writes CD-RW:"),
dev->device->writesCdrw() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, palette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Reads DVD:"),
dev->device->readsDvd() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, palette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Writes DVD-R(W):"),
dev->device->writesDvdMinus() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, palette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, tqpalette().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, palette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Writes DVD+R(W):"),
dev->device->writesDvdPlus() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, palette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, tqpalette().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, palette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, tqpalette().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, palette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, tqpalette().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, palette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
// and at last the write modes
(new K3bListViewItem( devRoot,
typeItem,
i18n("Write modes:"),
- K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, palette().disabled().foreground() );
+ K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, tqpalette().disabled().foreground() );
}
devRoot->setOpen(true);
@@ -383,7 +383,7 @@ void K3bDeviceWidget::slotNewDevice()
updateDeviceListViews();
}
else
- KMessageBox::error( this, i18n("Could not find an additional device at\n%1").arg(newDevicename), i18n("Error"), false );
+ KMessageBox::error( this, i18n("Could not find an additional device at\n%1").tqarg(newDevicename), i18n("Error"), false );
}
}
diff --git a/src/option/k3bexternalbinoptiontab.cpp b/src/option/k3bexternalbinoptiontab.cpp
index 00b26b3..4d3e062 100644
--- a/src/option/k3bexternalbinoptiontab.cpp
+++ b/src/option/k3bexternalbinoptiontab.cpp
@@ -27,7 +27,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -52,7 +52,7 @@ K3bExternalBinOptionTab::K3bExternalBinOptionTab( K3bExternalBinManager* manager
m_labelInfo->setText( i18n( "Specify the paths to the external programs that K3b needs to work properly, "
"or press \"Search\" to let K3b search for the programs." ) );
m_labelInfo->setScaledContents( false );
- m_labelInfo->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
+ m_labelInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
frameLayout->addWidget( m_labelInfo, 0, 0 );
}
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index 59d6446..28c6375 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -19,7 +19,7 @@
#include <tqpushbutton.h>
#include <kdebug.h>
#include <tqtabwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqheader.h>
#include <tqlabel.h>
#include <tqstringlist.h>
diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp
index 04e660d..cf740eb 100644
--- a/src/option/k3bmiscoptiontab.cpp
+++ b/src/option/k3bmiscoptiontab.cpp
@@ -124,10 +124,10 @@ bool K3bMiscOptionTab::saveSettings()
}
if( !fi.exists() ) {
- if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").arg(tempDir),
+ if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").tqarg(tempDir),
i18n("Create Directory"), i18n("Create"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( fi.absFilePath() ) ) {
- KMessageBox::error( this, i18n("Unable to create directory %1").arg(tempDir) );
+ KMessageBox::error( this, i18n("Unable to create directory %1").tqarg(tempDir) );
return false;
}
}
@@ -147,7 +147,7 @@ bool K3bMiscOptionTab::saveSettings()
// check for writing permission
if( !fi.isWritable() ) {
- KMessageBox::error( this, i18n("You do not have permission to write to %1.").arg(fi.absFilePath()) );
+ KMessageBox::error( this, i18n("You do not have permission to write to %1.").tqarg(fi.absFilePath()) );
return false;
}
diff --git a/src/option/k3bnotifyoptiontab.cpp b/src/option/k3bnotifyoptiontab.cpp
index f1acee4..5c12ee6 100644
--- a/src/option/k3bnotifyoptiontab.cpp
+++ b/src/option/k3bnotifyoptiontab.cpp
@@ -21,7 +21,7 @@
#include <knotifydialog.h>
#include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp
index 2cd8547..2b2b6af 100644
--- a/src/option/k3boptiondialog.cpp
+++ b/src/option/k3boptiondialog.cpp
@@ -26,7 +26,7 @@
#include <k3bsystemproblemdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqtabwidget.h>
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index ec4ca6c..0e037fc 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -147,7 +147,7 @@ void K3bThemeOptionTab::slotInstallTheme()
else
sorryText = i18n("Unable to download the icon theme archive.\n"
"Please check that address %1 is correct.");
- KMessageBox::sorry( this, sorryText.arg(themeURL.prettyURL()) );
+ KMessageBox::sorry( this, sorryText.tqarg(themeURL.prettyURL()) );
return;
}
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui
index 17bb26f..5961ea3 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>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui
index c0e2556..ba6cff3 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>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -62,7 +62,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="1">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -121,7 +121,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@@ -184,7 +184,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
@@ -235,7 +235,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui
index 4010416..5c0cbaa 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>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -96,7 +96,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
@@ -135,7 +135,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout15</cstring>
+ <cstring>tqlayout15</cstring>
</property>
<hbox>
<property name="name">
@@ -151,7 +151,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>0</height>
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>0</height>
diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui
index ce969da..6c72962 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>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<grid>
<property name="name">
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>350</width>
<height>50</height>
@@ -217,7 +217,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
@@ -257,7 +257,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>161</width>
<height>20</height>
@@ -276,7 +276,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>80</height>
diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui
index 3d5b488..b78f7dc 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>layout17</cstring>
+ <cstring>tqlayout17</cstring>
</property>
<hbox>
<property name="name">
@@ -190,7 +190,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout10</cstring>
+ <cstring>tqlayout10</cstring>
</property>
<grid>
<property name="name">
@@ -246,7 +246,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout16</cstring>
+ <cstring>tqlayout16</cstring>
</property>
<hbox>
<property name="name">
@@ -270,7 +270,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>261</width>
<height>21</height>
@@ -281,7 +281,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout18</cstring>
+ <cstring>tqlayout18</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui
index d1444a9..2688f4f 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>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -258,7 +258,7 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>0</height>
diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui
index 75b5d0a..000a552 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>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -134,7 +134,7 @@
<property name="text">
<string>Volume set &amp;number:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -231,7 +231,7 @@
</widget>
<widget class="TQLayoutWidget" row="11" column="1">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -260,7 +260,7 @@
</widget>
<widget class="TQLayoutWidget" row="9" column="1">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -289,7 +289,7 @@
</widget>
<widget class="TQLayoutWidget" row="10" column="1">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui
index 293ca92..c0bb2fe 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>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -239,10 +239,10 @@
<cstring>m_comboKeyboardLayout</cstring>
</property>
<property name="toolTip" stdset="0">
- <string>Select the layout of the keyboard</string>
+ <string>Select the tqlayout of the keyboard</string>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;p&gt;The keyboard layout selected here will be used for the eMovix commands like controlling the media player.</string>
+ <string>&lt;p&gt;The keyboard tqlayout selected here will be used for the eMovix commands like controlling the media player.</string>
</property>
</widget>
</grid>
diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp
index 1d3fbd3..0634caa 100644
--- a/src/projects/k3baudioburndialog.cpp
+++ b/src/projects/k3baudioburndialog.cpp
@@ -37,7 +37,7 @@
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtabwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -63,7 +63,7 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, cons
setTitle( i18n("Audio Project"),
i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)",
- m_doc->numOfTracks() ).arg(m_doc->length().toString()) );
+ m_doc->numOfTracks() ).tqarg(m_doc->length().toString()) );
TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
m_optionGroupLayout->addItem( spacer );
diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp
index 5f5610c..a1dff26 100644
--- a/src/projects/k3baudiocdtextwidget.cpp
+++ b/src/projects/k3baudiocdtextwidget.cpp
@@ -24,7 +24,7 @@
#include <tqtoolbutton.h>
#include <tqpushbutton.h>
#include <tqptrlist.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <klineedit.h>
diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp
index e32d24d..4a6e722 100644
--- a/src/projects/k3baudiodatasourceeditwidget.cpp
+++ b/src/projects/k3baudiodatasourceeditwidget.cpp
@@ -19,7 +19,7 @@
#include <k3baudiodatasource.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqtooltip.h>
@@ -37,7 +37,7 @@ K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* parent, co
TQLabel* startLabel = new TQLabel( i18n("Start Offset") + ":", this );
TQLabel* endLabel = new TQLabel( i18n("End Offset") + ":", this );
- endLabel->setAlignment( TQt::AlignRight );
+ endLabel->tqsetAlignment( TQt::AlignRight );
TQGridLayout* grid = new TQGridLayout( this );
grid->setMargin( 0 );
@@ -101,7 +101,7 @@ void K3bAudioDataSourceEditWidget::loadSource( K3bAudioDataSource* source )
false,
false,
i18n("Used part of the audio source"),
- colorGroup().highlight() );
+ tqcolorGroup().highlight() );
m_editStartOffset->setMaxValue( source->originalLength().lba() );
m_editEndOffset->setMaxValue( source->originalLength().lba() );
diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp
index 2f0b7a5..6609d00 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()->palette().disabled().foreground() );
+ setForegroundColor( 5, listView()->tqpalette().disabled().foreground() );
// smaller filename
f = listView()->font();
@@ -89,7 +89,7 @@ void K3bAudioDataSourceViewItem::setText( int col, const TQString& text )
bool K3bAudioDataSourceViewItem::animate()
{
if( source()->length() == 0 && source()->isValid() ) {
- TQString icon = TQString( "kde%1" ).arg( m_animationCounter );
+ TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter );
setPixmap( 4, SmallIcon( icon ) );
m_animationCounter++;
if ( m_animationCounter > 6 )
diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp
index ed17c01..fe0be91 100644
--- a/src/projects/k3baudioeditorwidget.cpp
+++ b/src/projects/k3baudioeditorwidget.cpp
@@ -125,7 +125,7 @@ protected:
if( m ) {
r.setLeft( p.x() - 1 );
r.setRight( p.x() + 1 );
- tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").arg(m->toolTip).arg(m->pos.toString()) );
+ tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").tqarg(m->toolTip).tqarg(m->pos.toString()) );
}
else {
Range* range = m_editorWidget->findRange( p );
@@ -134,8 +134,8 @@ protected:
r.setRight( m_editorWidget->msfToPos( range->end ) );
tip( r,
range->toolTip.isEmpty()
- ? TQString("%1 - %2").arg(range->start.toString()).arg(range->end.toString())
- : TQString("%1 (%2 - %3)").arg(range->toolTip).arg(range->start.toString()).arg(range->end.toString()) );
+ ? TQString("%1 - %2").tqarg(range->start.toString()).tqarg(range->end.toString())
+ : TQString("%1 (%2 - %3)").tqarg(range->toolTip).tqarg(range->start.toString()).tqarg(range->end.toString()) );
}
}
}
@@ -177,9 +177,9 @@ K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* parent, const char* name )
m_draggedMarker(0)
{
d = new Private;
- d->selectedRangeBrush = TQBrush(colorGroup().highlight());
+ d->selectedRangeBrush = TQBrush(tqcolorGroup().highlight());
- setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum );
+ tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum );
setFrameStyle( StyledPanel|Sunken );
setMouseTracking(true);
setCursor( TQt::PointingHandCursor );
@@ -201,7 +201,7 @@ K3bAudioEditorWidget::~K3bAudioEditorWidget()
}
-TQSize K3bAudioEditorWidget::minimumSizeHint() const
+TQSize K3bAudioEditorWidget::tqminimumSizeHint() const
{
constPolish();
// some fixed height minimum and enough space for a tickmark every minute
@@ -215,9 +215,9 @@ TQSize K3bAudioEditorWidget::minimumSizeHint() const
}
-TQSize K3bAudioEditorWidget::sizeHint() const
+TQSize K3bAudioEditorWidget::tqsizeHint() const
{
- return minimumSizeHint();
+ return tqminimumSizeHint();
}
@@ -263,7 +263,7 @@ bool K3bAudioEditorWidget::allowOverlappingRanges() const
void K3bAudioEditorWidget::enableRangeSelection( bool b )
{
d->rangeSelectionEnabled = b;
- repaint( false );
+ tqrepaint( false );
}
@@ -283,7 +283,7 @@ void K3bAudioEditorWidget::setSelectedRange( K3bAudioEditorWidget::Range* r )
{
d->selectedRange = r;
if( rangeSelectedEnabled() ) {
- repaint( false );
+ tqrepaint( false );
emit selectedRangeChanged( d->selectedRange ? d->selectedRange->id : 0 );
}
}
@@ -307,7 +307,7 @@ int K3bAudioEditorWidget::addRange( const K3b::Msf& start, const K3b::Msf& end,
return -1;
Range* r = new Range( m_idCnt++, start, end, startFixed, endFixed, toolTip,
- brush.style() != TQBrush::NoBrush ? brush : TQBrush(colorGroup().background()) );
+ brush.style() != TQBrush::NoBrush ? brush : TQBrush(tqcolorGroup().background()) );
d->ranges.inSort( r );
// only update the changed range
@@ -356,7 +356,7 @@ bool K3bAudioEditorWidget::modifyRange( int identifier, const K3b::Msf& start, c
if( !d->allowOverlappingRanges )
fixupOverlappingRanges( range );
- repaint( false );
+ tqrepaint( false );
return true;
}
@@ -372,7 +372,7 @@ bool K3bAudioEditorWidget::removeRange( int identifier )
emit rangeRemoved( identifier );
- // repaint only the part of the range
+ // tqrepaint only the part of the range
TQRect rect = contentsRect();
rect.setLeft( msfToPos( range->start ) );
rect.setRight( msfToPos( range->end ) );
@@ -433,7 +433,7 @@ void K3bAudioEditorWidget::setMaxNumberOfMarkers( int i )
int K3bAudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const TQString& toolTip, const TQColor& color )
{
if( pos < m_length ) {
- Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : colorGroup().foreground(), toolTip );
+ Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : tqcolorGroup().foreground(), toolTip );
m_markers.inSort( m );
return m->id;
}
@@ -488,16 +488,16 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p )
{
// double buffering
TQPixmap pix( contentsRect().size() );
- pix.fill( colorGroup().base() );
+ pix.fill( tqcolorGroup().base() );
TQPainter pixP;
- pixP.begin( &pix, TQT_TQOBJECT(this) );
+ pixP.tqbegin( &pix, TQT_TQOBJECT(this) );
TQRect drawRect( contentsRect() );
drawRect.setLeft( drawRect.left() + m_margin );
drawRect.setRight( drawRect.right() - m_margin );
- // from minimumSizeHint()
+ // from tqminimumSizeHint()
// int neededHeight = fontMetrics().height() + 12 + 6;
// drawRect.setTop( drawRect.top() + (drawRect.height() - neededHeight)/2 );
@@ -690,11 +690,11 @@ void K3bAudioEditorWidget::mouseReleaseEvent( TQMouseEvent* e )
//
if( m_draggedRange ) {
fixupOverlappingRanges( m_draggedRange );
- repaint( false );
+ tqrepaint( false );
}
else if( d->movedRange ) {
fixupOverlappingRanges( d->movedRange );
- repaint( false );
+ tqrepaint( false );
}
}
@@ -739,13 +739,13 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e )
emit rangeChanged( m_draggedRange->id, m_draggedRange->start, m_draggedRange->end );
- repaint( false );
+ tqrepaint( false );
}
else if( m_draggedMarker ) {
m_draggedMarker->pos = posToMsf( e->pos().x() );
emit markerMoved( m_draggedMarker->id, m_draggedMarker->pos );
- repaint( false );
+ tqrepaint( false );
}
else if( d->movedRange ) {
int diff = posToMsf( e->pos().x() ).lba() - d->lastMovePosition.lba();
@@ -763,7 +763,7 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e )
emit rangeChanged( d->movedRange->id, d->movedRange->start, d->movedRange->end );
- repaint( false );
+ tqrepaint( false );
}
}
else if( findRangeEdge( e->pos() ) || findMarker( e->pos() ) )
diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h
index 0638a25..b2edfa2 100644
--- a/src/projects/k3baudioeditorwidget.h
+++ b/src/projects/k3baudioeditorwidget.h
@@ -34,8 +34,8 @@ class K3bAudioEditorWidget : public TQFrame
K3bAudioEditorWidget( TQWidget* parent = 0, const char* name = 0 );
~K3bAudioEditorWidget();
- TQSize sizeHint() const;
- TQSize minimumSizeHint() const;
+ TQSize tqsizeHint() const;
+ TQSize tqminimumSizeHint() const;
/**
* For now the Editor has only one parameter: the length data.
diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp
index fe99b56..5e5ca7e 100644
--- a/src/projects/k3baudiotrackaddingdialog.cpp
+++ b/src/projects/k3baudiotrackaddingdialog.cpp
@@ -30,7 +30,7 @@
#include <kmessagebox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqfileinfo.h>
#include <tqtimer.h>
#include <tqdir.h>
@@ -104,7 +104,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls,
dlg.m_trackAfter = afterTrack;
dlg.m_parentTrack = parentTrack;
dlg.m_sourceAfter = afterSource;
- dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").arg(doc->URL().fileName()) );
+ dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) );
dlg.m_busyWidget->showBusy(true);
TQTimer::singleShot( 0, &dlg, TQT_SLOT(slotAddUrls()) );
@@ -113,23 +113,23 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls,
TQString message;
if( !dlg.m_unreadableFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("Insufficient permissions to read the following files") )
- .arg( dlg.m_unreadableFiles.join( "<br>" ) );
+ .tqarg( i18n("Insufficient permissions to read the following files") )
+ .tqarg( dlg.m_unreadableFiles.join( "<br>" ) );
if( !dlg.m_notFoundFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("Unable to find the following files") )
- .arg( dlg.m_notFoundFiles.join( "<br>" ) );
+ .tqarg( i18n("Unable to find the following files") )
+ .tqarg( dlg.m_notFoundFiles.join( "<br>" ) );
if( !dlg.m_nonLocalFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("No non-local files supported") )
- .arg( dlg.m_unreadableFiles.join( "<br>" ) );
+ .tqarg( i18n("No non-local files supported") )
+ .tqarg( dlg.m_unreadableFiles.join( "<br>" ) );
if( !dlg.m_unsupportedFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br><i>%2</i><br>%3")
- .arg( i18n("Unable to handle the following files due to an unsupported format" ) )
- .arg( i18n("You may manually convert these audio files to wave using another "
+ .tqarg( i18n("Unable to handle the following files due to an unsupported format" ) )
+ .tqarg( i18n("You may manually convert these audio files to wave using another "
"application supporting the audio format and then add the wave files "
"to the K3b project.") )
- .arg( dlg.m_unsupportedFiles.join( "<br>" ) );
+ .tqarg( dlg.m_unsupportedFiles.join( "<br>" ) );
if( !message.isEmpty() )
KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message );
@@ -162,7 +162,7 @@ void K3bAudioTrackAddingDialog::slotAddUrls()
}
}
- m_infoLabel->setText( i18n("Analysing file '%1'...").arg( url.fileName() ) );
+ m_infoLabel->setText( i18n("Analysing file '%1'...").tqarg( url.fileName() ) );
if( !url.isLocalFile() ) {
valid = false;
diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp
index 2572f30..bdfb9f0 100644
--- a/src/projects/k3baudiotrackdialog.cpp
+++ b/src/projects/k3baudiotrackdialog.cpp
@@ -14,9 +14,9 @@
*/
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqframe.h>
#include <tqcheckbox.h>
diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp
index c73342c..adc1e41 100644
--- a/src/projects/k3baudiotrackplayer.cpp
+++ b/src/projects/k3baudiotrackplayer.cpp
@@ -185,9 +185,9 @@ void K3bAudioTrackPlayer::playTrack( K3bAudioTrack* track )
// we show the currently playing track as a tooltip on the slider
TQToolTip::remove( d->seekSlider );
TQToolTip::add( d->seekSlider, i18n("Playing track %1: %2 - %3")
- .arg(track->trackNumber())
- .arg(track->artist())
- .arg(track->title()) );
+ .tqarg(track->trackNumber())
+ .tqarg(track->artist())
+ .tqarg(track->title()) );
d->seekSlider->setMaxValue( track->length().totalFrames() );
m_currentTrack = track;
d->paused = true;
diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp
index f75b8da..6a987e6 100644
--- a/src/projects/k3baudiotracksplitdialog.cpp
+++ b/src/projects/k3baudiotracksplitdialog.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidget* parent, const char* name )
@@ -42,19 +42,19 @@ K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidg
m_msfEditStart = new K3bMsfEdit( frame );
m_msfEditEnd = new K3bMsfEdit( frame );
- TQGridLayout* layout = new TQGridLayout( frame );
- layout->setMargin( 0 );
- layout->setSpacing( spacingHint() );
+ TQGridLayout* tqlayout = new TQGridLayout( frame );
+ tqlayout->setMargin( 0 );
+ tqlayout->setSpacing( spacingHint() );
// FIXME: After the string freeze replace the text with a better one explaning how to use this dialog
- layout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."),
+ tqlayout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."),
frame ), 0, 0, 0, 3 );
- 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 );
+ 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 );
m_editorWidget->setAllowOverlappingRanges( false );
m_editorWidget->enableRangeSelection( true );
diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp
index 6c1b8a8..0bf23ec 100644
--- a/src/projects/k3baudiotracktrmlookupdialog.cpp
+++ b/src/projects/k3baudiotracktrmlookupdialog.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <tqframe.h>
#include <tqeventloop.h>
@@ -122,7 +122,7 @@ void K3bAudioTrackTRMLookupDialog::slotTrackFinished( K3bAudioTrack* track, bool
{
if( !success )
K3bPassivePopup::showPopup( i18n("Track %1 was not found in the MusicBrainz database.")
- .arg( track->trackNumber()),
+ .tqarg( track->trackNumber()),
i18n("Audio Project") );
}
diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp
index 4c21d0b..23f3478 100644
--- a/src/projects/k3baudiotrackview.cpp
+++ b/src/projects/k3baudiotrackview.cpp
@@ -46,7 +46,7 @@
#include <tqevent.h>
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqvaluelist.h>
@@ -487,7 +487,7 @@ void K3bAudioTrackView::slotTrackChanged( K3bAudioTrack* track )
item->showSources(true);
// the length might have changed
- item->repaint();
+ item->tqrepaint();
// FIXME: only do this if the position really changed
// move the item if the position has changed
diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp
index 67483ad..24d6f48 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()->palette().disabled().foreground() );
+ setForegroundColor( 5, listView()->tqpalette().disabled().foreground() );
// smaller filename
f = listView()->font();
@@ -194,7 +194,7 @@ bool K3bAudioTrackViewItem::animate()
item = item->nextSibling();
}
if( animate ) {
- TQString icon = TQString( "kde%1" ).arg( m_animationCounter );
+ TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter );
setPixmap( 4, SmallIcon( icon ) );
m_animationCounter++;
if ( m_animationCounter > 6 )
diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp
index 187b542..c0019b9 100644
--- a/src/projects/k3baudioview.cpp
+++ b/src/projects/k3baudioview.cpp
@@ -38,7 +38,7 @@
#include <k3bprojectplugin.h>
// QT-includes
-#include <layout.h>
+#include <tqlayout.h>
#include <tqstring.h>
// KDE-includes
diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp
index cf2f086..92b4c87 100644
--- a/src/projects/k3bbootimageview.cpp
+++ b/src/projects/k3bbootimageview.cpp
@@ -61,7 +61,7 @@ public:
return i18n("None");
}
else if( col == 1 )
- return TQString( "%1 KB" ).arg( m_image->size()/1024 );
+ return TQString( "%1 KB" ).tqarg( m_image->size()/1024 );
else if( col == 2 )
return m_image->localPath();
else
diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp
index 1697523..782d898 100644
--- a/src/projects/k3bdataadvancedimagesettingswidget.cpp
+++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp
@@ -24,7 +24,7 @@
#include <tqwhatsthis.h>
#include <tqpoint.h>
#include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqvalidator.h>
#include <tqregexp.h>
@@ -130,7 +130,7 @@ public:
protected:
void stateChange( bool on ) {
- // enable or disable all children
+ // enable or disable all tqchildren
TQListViewItem* item = firstChild();
while( item ) {
if( PrivateCheckViewItem* pi = dynamic_cast<PrivateCheckViewItem*>(item) )
@@ -205,13 +205,13 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget
i18n("ISO Level") );
m_radioIsoLevel3 = new TQCheckListItem( m_isoLevelController,
- i18n("Level %1").arg(3),
+ i18n("Level %1").tqarg(3),
TQCheckListItem::RadioButton );
m_radioIsoLevel2 = new TQCheckListItem( m_isoLevelController,
- i18n("Level %1").arg(2),
+ i18n("Level %1").tqarg(2),
TQCheckListItem::RadioButton );
m_radioIsoLevel1 = new TQCheckListItem( m_isoLevelController,
- i18n("Level %1").arg(1),
+ i18n("Level %1").tqarg(1),
TQCheckListItem::RadioButton );
m_isoLevelController->setOpen(true);
diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp
index 0d3cc44..2b4375f 100644
--- a/src/projects/k3bdataburndialog.cpp
+++ b/src/projects/k3bdataburndialog.cpp
@@ -39,7 +39,7 @@
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -69,7 +69,7 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c
{
prepareGui();
- setTitle( i18n("Data Project"), i18n("Size: %1").arg( KIO::convertSize(_doc->size()) ) );
+ setTitle( i18n("Data Project"), i18n("Size: %1").tqarg( KIO::convertSize(_doc->size()) ) );
// for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@@ -181,7 +181,7 @@ void K3bDataBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) {
// delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked
diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp
index 04c6cb9..6164aa2 100644
--- a/src/projects/k3bdatadirtreeview.cpp
+++ b/src/projects/k3bdatadirtreeview.cpp
@@ -249,7 +249,7 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item )
// we don't get removedInfo for the child items
// so we need to remove them here
- TQPtrListIterator<K3bDataItem> it( dirItem->children() );
+ TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() );
for( ; it.current(); ++it ) {
if( it.current()->isDir() )
slotDataItemRemoved( it.current() );
@@ -374,9 +374,9 @@ void K3bDataDirTreeView::slotProperties()
if( viewItem && currentItem() != root() ) {
K3bDataPropertiesDialog d( viewItem->dataItem(), this );
if( d.exec() ) {
- repaint();
+ tqrepaint();
if( m_fileView )
- m_fileView->repaint();
+ m_fileView->tqrepaint();
}
}
else
@@ -499,7 +499,7 @@ void K3bDataDirTreeView::slotDocChanged()
// avoid flicker
if( d->lastUpdateVolumeId != m_doc->isoOptions().volumeID() ) {
d->lastUpdateVolumeId = m_doc->isoOptions().volumeID();
- root()->repaint();
+ root()->tqrepaint();
}
}
diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp
index afe94a3..b29f8ad 100644
--- a/src/projects/k3bdatafileview.cpp
+++ b/src/projects/k3bdatafileview.cpp
@@ -165,7 +165,7 @@ void K3bDataFileView::checkForNewItems()
hideEditor();
// add items that are not there yet
- for( TQPtrListIterator<K3bDataItem> it( m_currentDir->children() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_currentDir->tqchildren() ); it.current(); ++it ) {
if( !m_itemMap.contains( it.current() ) ) {
slotItemAdded( it.current() );
}
diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp
index 837f9b5..88decbc 100644
--- a/src/projects/k3bdataimagesettingswidget.cpp
+++ b/src/projects/k3bdataimagesettingswidget.cpp
@@ -26,7 +26,7 @@
#include <tqcombobox.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kmessagebox.h>
#include <klocale.h>
@@ -157,7 +157,7 @@ public:
setMainWidget( w );
// give ourselves a reasonable size
- TQSize s = sizeHint();
+ TQSize s = tqsizeHint();
s.setWidth( TQMAX(s.width(), 300) );
resize( s );
}
@@ -171,7 +171,7 @@ K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* parent, const
: base_K3bDataImageSettings( parent, name ),
m_fileSystemOptionsShown(true)
{
- layout()->setMargin( KDialog::marginHint() );
+ tqlayout()->setMargin( KDialog::marginHint() );
m_customFsDlg = new CustomFilesystemsDialog( this );
m_volDescDlg = new VolumeDescDialog( this );
@@ -268,7 +268,7 @@ void K3bDataImageSettingsWidget::slotFilesystemsChanged()
if( s.isEmpty() )
m_comboFilesystems->changeItem( i18n("Custom (ISO9660 only)"), FS_CUSTOM );
else
- m_comboFilesystems->changeItem( i18n("Custom (%1)").arg( s.join(", ") ), FS_CUSTOM );
+ m_comboFilesystems->changeItem( i18n("Custom (%1)").tqarg( s.join(", ") ), FS_CUSTOM );
// see if any of the presets is loaded
m_comboFilesystems->setCurrentItem( FS_CUSTOM );
diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp
index 05de7ee..6a3c057 100644
--- a/src/projects/k3bdatapropertiesdialog.cpp
+++ b/src/projects/k3bdatapropertiesdialog.cpp
@@ -22,7 +22,7 @@
#include <k3bvalidators.h>
#include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqframe.h>
#include <tqcheckbox.h>
@@ -94,7 +94,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
KFileItem kFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(fileItem->localPath()) );
labelMimeType->setPixmap( kFileItem.pixmap(KIcon::SizeLarge) );
if( fileItem->isSymLink() )
- m_labelType->setText( i18n("Link to %1").arg(kFileItem.mimeComment()) );
+ m_labelType->setText( i18n("Link to %1").tqarg(kFileItem.mimeComment()) );
else
m_labelType->setText( kFileItem.mimeComment() );
m_labelLocalName->setText( kFileItem.name() );
@@ -136,7 +136,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
if( location.isEmpty() )
location = "/";
m_labelLocation->setText( location );
- extraInfoLabel->setText( TQString( "(%1)" ).arg(dataItem->extraInfo()) );
+ extraInfoLabel->setText( TQString( "(%1)" ).tqarg(dataItem->extraInfo()) );
if( dataItem->extraInfo().isEmpty() )
extraInfoLabel->hide();
@@ -168,7 +168,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
sortingBoxGrid->setMargin( marginHint() );
m_editSortWeight = new KLineEdit( sortingBox );
m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) );
- m_editSortWeight->setAlignment( TQt::AlignRight );
+ m_editSortWeight->tqsetAlignment( TQt::AlignRight );
sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 );
sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 );
sortingBoxGrid->setColStretch( 1, 1 );
@@ -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 layout "
+ "<p>This option is useful in order to optimize the data tqlayout "
"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/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index 6e63076..630d7f9 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -20,7 +20,7 @@
#include <tqtimer.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqdir.h>
#include <tqfileinfo.h>
@@ -57,7 +57,7 @@
K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* parent, const char* name )
: KDialogBase( Plain,
- i18n("Adding files to project '%1'").arg(doc->URL().fileName()),
+ i18n("Adding files to project '%1'").tqarg(doc->URL().fileName()),
Cancel,
Cancel,
parent,
@@ -84,7 +84,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren
m_counterLabel = new TQLabel( page );
m_infoLabel = new KSqueezedTextLabel( i18n("Adding files to project '%1'")
- .arg(doc->URL().fileName()) + "...", page );
+ .tqarg(doc->URL().fileName()) + "...", page );
m_progressWidget = new KProgress( 0, page );
grid->addWidget( m_counterLabel, 0, 1 );
@@ -96,7 +96,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren
this, TQT_SLOT(slotDirSizeDone(bool)) );
// try to start with a reasonable size
- resize( (int)( fontMetrics().width( caption() ) * 1.5 ), sizeHint().height() );
+ resize( (int)( fontMetrics().width( caption() ) * 1.5 ), tqsizeHint().height() );
}
@@ -169,29 +169,29 @@ TQString K3bDataUrlAddingDialog::resultMessage() const
TQString message;
if( !m_unreadableFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("Insufficient permissions to read the following files") )
- .arg( m_unreadableFiles.join( "<br>" ) );
+ .tqarg( i18n("Insufficient permissions to read the following files") )
+ .tqarg( m_unreadableFiles.join( "<br>" ) );
if( !m_notFoundFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("Unable to find the following files") )
- .arg( m_notFoundFiles.join( "<br>" ) );
+ .tqarg( i18n("Unable to find the following files") )
+ .tqarg( m_notFoundFiles.join( "<br>" ) );
if( !m_nonLocalFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("No non-local files supported") )
- .arg( m_unreadableFiles.join( "<br>" ) );
+ .tqarg( i18n("No non-local files supported") )
+ .tqarg( m_unreadableFiles.join( "<br>" ) );
if( !m_tooBigFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("It is not possible to add files bigger than %1").arg(KIO::convertSize(0xFFFFFFFF)) )
- .arg( m_tooBigFiles.join( "<br>" ) );
+ .tqarg( i18n("It is not possible to add files bigger than %1").tqarg(KIO::convertSize(0xFFFFFFFF)) )
+ .tqarg( m_tooBigFiles.join( "<br>" ) );
if( !m_mkisofsLimitationRenamedFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("Some filenames had to be modified due to limitations in mkisofs") )
- .arg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) );
+ .tqarg( i18n("Some filenames had to be modified due to limitations in mkisofs") )
+ .tqarg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) );
if( !m_invalidFilenameEncodingFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("The following filenames have an invalid encoding. You may fix this "
+ .tqarg( i18n("The following filenames have an invalid encoding. You may fix this "
"with the convmv tool") )
- .arg( m_invalidFilenameEncodingFiles.join( "<br>" ) );
+ .tqarg( m_invalidFilenameEncodingFiles.join( "<br>" ) );
return message;
}
@@ -222,7 +222,7 @@ int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& item
return 0;
K3bDataUrlAddingDialog dlg( dir->doc(), parent );
- dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").arg(dir->doc()->URL().fileName()) );
+ dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").tqarg(dir->doc()->URL().fileName()) );
dlg.m_copyItems = copy;
for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) {
@@ -283,9 +283,9 @@ void K3bDataUrlAddingDialog::slotAddUrls()
#if 0
m_infoLabel->setText( url.path() );
if( m_totalFiles == 0 )
- m_counterLabel->setText( TQString("(%1)").arg(m_filesHandled) );
+ m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) );
else
- m_counterLabel->setText( TQString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) );
+ m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) );
#endif
//
@@ -425,8 +425,8 @@ void K3bDataUrlAddingDialog::slotAddUrls()
switch( K3bMultiChoiceDialog::choose( i18n("File already exists"),
i18n("<p>File <em>%1</em> already exists in "
"project folder <em>%2</em>.")
- .arg(newName)
- .arg('/' + dir->k3bPath()),
+ .tqarg(newName)
+ .tqarg('/' + dir->k3bPath()),
TQMessageBox::Warning,
this,
0,
@@ -493,8 +493,8 @@ void K3bDataUrlAddingDialog::slotAddUrls()
"K3b project cannot be resolved."
"<p><b>If you do not intend to enable the option <em>follow symbolic links</em> you may safely "
"ignore this warning and choose to add the link to the project.</b>")
- .arg(absFilePath)
- .arg(resolved ),
+ .tqarg(absFilePath)
+ .tqarg(resolved ),
TQMessageBox::Warning,
this,
0,
@@ -603,9 +603,9 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
++m_filesHandled;
m_infoLabel->setText( item->k3bPath() );
if( m_totalFiles == 0 )
- m_counterLabel->setText( TQString("(%1)").arg(m_filesHandled) );
+ m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) );
else
- m_counterLabel->setText( TQString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) );
+ m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) );
if( dir == item->parent() ) {
@@ -623,7 +623,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
// reuse an existing dir: move all child items into the old dir
//
if( oldItem->isDir() && item->isDir() ) {
- const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->children();
+ const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->tqchildren();
for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it )
m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) );
@@ -661,8 +661,8 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
switch( K3bMultiChoiceDialog::choose( i18n("File already exists"),
i18n("<p>File <em>%1</em> already exists in "
"project folder <em>%2</em>.")
- .arg( item->k3bName() )
- .arg("/" + dir->k3bPath()),
+ .tqarg( item->k3bName() )
+ .tqarg("/" + dir->k3bPath()),
TQMessageBox::Warning,
this,
0,
diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp
index e7c0bf4..1ac59f8 100644
--- a/src/projects/k3bdataview.cpp
+++ b/src/projects/k3bdataview.cpp
@@ -43,7 +43,7 @@
#include <tqpixmap.h>
#include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqdragobject.h>
#include <tqheader.h>
#include <tqptrlist.h>
diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp
index 49fe587..c60f5d7 100644
--- a/src/projects/k3bdataviewitem.cpp
+++ b/src/projects/k3bdataviewitem.cpp
@@ -31,7 +31,7 @@
#include <kpixmap.h>
#include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqfileinfo.h>
@@ -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()->palette().disabled().foreground() );
+ _cg.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().foreground() );
}
if( column == 0 ) {
@@ -182,7 +182,7 @@ void K3bDataDirViewItem::highlightIcon( bool b )
m_pixmap = *pixmap(0);
if( b )
- setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->colorGroup().highlight() ) );
+ setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->tqcolorGroup().highlight() ) );
else
setPixmap( 0, m_pixmap );
}
@@ -228,7 +228,7 @@ TQString K3bDataFileViewItem::text( int index ) const
comment = m_pMimeType->name();
if( m_fileItem->isSymLink() )
- return i18n("Link to %1").arg(comment);
+ return i18n("Link to %1").tqarg(comment);
else
return comment;
}
diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp
index 4cff97e..17ee516 100644
--- a/src/projects/k3bdvdburndialog.cpp
+++ b/src/projects/k3bdvdburndialog.cpp
@@ -33,7 +33,7 @@
#include <kio/global.h>
#include <kmessagebox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
@@ -50,7 +50,7 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char
{
prepareGui();
- setTitle( i18n("DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) );
+ setTitle( i18n("DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) );
// for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@@ -283,7 +283,7 @@ void K3bDvdBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) {
// delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked
diff --git a/src/projects/k3bencodingconverter.cpp b/src/projects/k3bencodingconverter.cpp
index 273e664..9fa2a79 100644
--- a/src/projects/k3bencodingconverter.cpp
+++ b/src/projects/k3bencodingconverter.cpp
@@ -18,7 +18,7 @@
#include "k3bencodingconverter.h"
#include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kdebug.h>
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index bad58df..30f10e6 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -35,7 +35,7 @@
#include <tqvalidator.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <tqtimer.h>
@@ -72,7 +72,7 @@ K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* p
{
d = new Private();
d->doc = doc;
- setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) );
+ tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) );
}
@@ -102,13 +102,13 @@ void K3bFillStatusDisplayWidget::setCdSize( const K3b::Msf& size )
}
-TQSize K3bFillStatusDisplayWidget::sizeHint() const
+TQSize K3bFillStatusDisplayWidget::tqsizeHint() const
{
- return minimumSizeHint();
+ return tqminimumSizeHint();
}
-TQSize K3bFillStatusDisplayWidget::minimumSizeHint() const
+TQSize K3bFillStatusDisplayWidget::tqminimumSizeHint() const
{
int margin = 2;
TQFontMetrics fm( font() );
@@ -127,9 +127,9 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* )
{
// double buffer
TQPixmap buffer( size() );
- buffer.fill( colorGroup().base() );
+ buffer.fill( tqcolorGroup().base() );
TQPainter p;
- p.begin( &buffer, TQT_TQOBJECT(this) );
+ p.tqbegin( &buffer, TQT_TQOBJECT(this) );
p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color)
long long docSize;
@@ -199,16 +199,16 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* )
TQString overSizeText;
if( d->cdSize.mode1Bytes() >= d->doc->size() )
overSizeText = i18n("Available: %1 of %2")
- .arg( d->showTime
- ? i18n("%1 min").arg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false))
+ .tqarg( d->showTime
+ ? i18n("%1 min").tqarg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false))
: KIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) )
- .arg( d->showTime
- ? i18n("%1 min").arg(K3b::Msf( cdSize*60*75 ).toString(false))
+ .tqarg( d->showTime
+ ? i18n("%1 min").tqarg(K3b::Msf( cdSize*60*75 ).toString(false))
: KIO::convertSizeFromKB( cdSize * 1024 ) );
else
overSizeText = i18n("Capacity exceeded by %1")
- .arg( d->showTime
- ? i18n("%1 min").arg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false))
+ .tqarg( d->showTime
+ ? i18n("%1 min").tqarg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false))
: KIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) );
// ====================================================================================
@@ -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* 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 );
+ 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 );
setupPopupMenu();
@@ -388,11 +388,11 @@ void K3bFillStatusDisplay::setupPopupMenu()
d->actionAuto = new KRadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()),
d->actionCollection, "fillstatus_auto" );
- d->action74Min = new KRadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()),
+ d->action74Min = new KRadioAction( i18n("%1 MB").tqarg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()),
d->actionCollection, "fillstatus_74minutes" );
- d->action80Min = new KRadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()),
+ d->action80Min = new KRadioAction( i18n("%1 MB").tqarg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()),
d->actionCollection, "fillstatus_80minutes" );
- d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()),
+ d->action100Min = new KRadioAction( i18n("%1 MB").tqarg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()),
d->actionCollection, "fillstatus_100minutes" );
d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()),
d->actionCollection, "fillstatus_dvd_4_7gb" );
@@ -460,9 +460,9 @@ void K3bFillStatusDisplay::showSize()
{
d->actionShowMegs->setChecked( true );
- d->action74Min->setText( i18n("%1 MB").arg(650) );
- d->action80Min->setText( i18n("%1 MB").arg(700) );
- d->action100Min->setText( i18n("%1 MB").arg(880) );
+ d->action74Min->setText( i18n("%1 MB").tqarg(650) );
+ d->action80Min->setText( i18n("%1 MB").tqarg(700) );
+ d->action100Min->setText( i18n("%1 MB").tqarg(880) );
d->showTime = false;
d->displayWidget->setShowTime(false);
@@ -548,7 +548,7 @@ void K3bFillStatusDisplay::slotCustomSize()
i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, "
"and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>"
" respectively."),
- d->showDvdSizes ? TQString("4%14%2").arg(KGlobal::locale()->decimalSymbol()).arg(gbS) :
+ d->showDvdSizes ? TQString("4%14%2").tqarg(KGlobal::locale()->decimalSymbol()).tqarg(gbS) :
(d->showTime ? TQString("74")+minS : TQString("650")+mbS),
&ok, this, (const char*)0,
new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) );
@@ -577,7 +577,7 @@ void K3bFillStatusDisplay::slotCustomSize()
void K3bFillStatusDisplay::slotMenuButtonClicked()
{
- TQSize size = d->showDvdSizes ? d->dvdPopup->sizeHint() : d->popup->sizeHint();
+ TQSize size = d->showDvdSizes ? d->dvdPopup->tqsizeHint() : d->popup->tqsizeHint();
slotPopupMenu( d->buttonMenu->mapToGlobal(TQPoint(d->buttonMenu->width(), 0)) +
TQPoint(-1*size.width(), -1*size.height()) );
}
diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h
index f219ec8..c1cc810 100644
--- a/src/projects/k3bfillstatusdisplay.h
+++ b/src/projects/k3bfillstatusdisplay.h
@@ -51,8 +51,8 @@ class K3bFillStatusDisplayWidget : public TQWidget
K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* parent );
~K3bFillStatusDisplayWidget();
- TQSize sizeHint() const;
- TQSize minimumSizeHint() const;
+ TQSize tqsizeHint() const;
+ TQSize tqminimumSizeHint() const;
const K3b::Msf& cdSize() const;
diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp
index 6584201..2053e32 100644
--- a/src/projects/k3bmixedburndialog.cpp
+++ b/src/projects/k3bmixedburndialog.cpp
@@ -44,7 +44,7 @@
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -66,7 +66,7 @@ K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, cons
setTitle( i18n("Mixed Project"), i18n("1 track (%1 minutes)",
"%n tracks (%1 minutes)",
- m_doc->numOfTracks()).arg(m_doc->length().toString()) );
+ m_doc->numOfTracks()).tqarg(m_doc->length().toString()) );
m_checkOnlyCreateImage->hide();
diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp
index dd644b5..c19bd28 100644
--- a/src/projects/k3bmixeddirtreeview.cpp
+++ b/src/projects/k3bmixeddirtreeview.cpp
@@ -42,7 +42,7 @@ public:
TQString text( int col ) const {
if( col == 0 )
- return i18n("Audio Tracks") + TQString(" (%1)").arg(m_doc->audioDoc()->numOfTracks());
+ return i18n("Audio Tracks") + TQString(" (%1)").tqarg(m_doc->audioDoc()->numOfTracks());
else
return TQString();
}
@@ -97,7 +97,7 @@ void K3bMixedDirTreeView::slotSelectionChanged( TQListViewItem* i )
void K3bMixedDirTreeView::slotNewAudioTracks()
{
// update the tracknumber
- m_audioRootItem->repaint();
+ m_audioRootItem->tqrepaint();
}
#include "k3bmixeddirtreeview.moc"
diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp
index 436c4c0..8d1b939 100644
--- a/src/projects/k3bmixedview.cpp
+++ b/src/projects/k3bmixedview.cpp
@@ -33,7 +33,7 @@
#include <tqwidgetstack.h>
#include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvaluelist.h>
#include <kdialog.h>
diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp
index fd99cad..4a49d4f 100644
--- a/src/projects/k3bmovixburndialog.cpp
+++ b/src/projects/k3bmovixburndialog.cpp
@@ -38,7 +38,7 @@
#include <kconfig.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqfileinfo.h>
@@ -52,7 +52,7 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, cons
m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE );
setTitle( i18n("eMovix CD Project"),
- i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) );
+ i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) );
m_movixOptionsWidget = new K3bMovixOptionsWidget( this );
addPage( m_movixOptionsWidget, i18n("eMovix") );
@@ -226,7 +226,7 @@ void K3bMovixBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue )
return;
diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp
index 0dbd3d9..9cc5617 100644
--- a/src/projects/k3bmovixdvdburndialog.cpp
+++ b/src/projects/k3bmovixdvdburndialog.cpp
@@ -40,7 +40,7 @@
#include <kdebug.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqfileinfo.h>
@@ -54,7 +54,7 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* par
m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE );
setTitle( i18n("eMovix DVD Project"),
- i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) );
+ i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) );
m_movixOptionsWidget = new K3bMovixOptionsWidget( this );
addPage( m_movixOptionsWidget, i18n("eMovix") );
@@ -193,7 +193,7 @@ void K3bMovixDvdBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue )
return;
diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp
index 44136b5..e43dfd5 100644
--- a/src/projects/k3bmovixlistview.cpp
+++ b/src/projects/k3bmovixlistview.cpp
@@ -84,7 +84,7 @@ TQString K3bMovixFileViewItem::text( int col ) const
case 2:
{
if( fileItem()->isSymLink() )
- return i18n("Link to %1").arg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " ";
+ return i18n("Link to %1").tqarg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " ";
else
return const_cast<K3bMovixFileViewItem*>(this)->mimeComment() + " ";
}
@@ -139,7 +139,7 @@ TQString K3bMovixSubTitleViewItem::text( int c ) const
case 2:
{
if( fileItem()->subTitleItem()->isSymLink() )
- return i18n("Link to %1").arg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment());
+ return i18n("Link to %1").tqarg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment());
else
return const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment();
}
diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp
index 0733c70..58c6ba7 100644
--- a/src/projects/k3bmovixview.cpp
+++ b/src/projects/k3bmovixview.cpp
@@ -33,7 +33,7 @@
#include <kmessagebox.h>
#include <kurl.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqlineedit.h>
diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp
index d39b88c..2074cd2 100644
--- a/src/projects/k3bmusicbrainzjob.cpp
+++ b/src/projects/k3bmusicbrainzjob.cpp
@@ -188,7 +188,7 @@ void K3bMusicBrainzJob::start()
m_trmThread->track = m_tracks.first();
emit infoMessage( i18n("Generating fingerprint for track %1.")
- .arg(m_tracks.current()->trackNumber()), INFO );
+ .tqarg(m_tracks.current()->trackNumber()), INFO );
m_trmJob->start();
}
@@ -215,7 +215,7 @@ void K3bMusicBrainzJob::slotTrmJobFinished( bool success )
// now query musicbrainz
m_mbThread->setSignature( m_trmThread->signature() );
emit infoMessage( i18n("Querying MusicBrainz for track %1.")
- .arg(m_tracks.current()->trackNumber()), INFO );
+ .tqarg(m_tracks.current()->trackNumber()), INFO );
m_mbJob->start();
}
else {
@@ -253,8 +253,8 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success )
if( resultStringsUnique.count() > 1 )
s = KInputDialog::getItem( i18n("MusicBrainz Query"),
i18n("Found multiple matches for track %1 (%2). Please select one.")
- .arg(m_tracks.current()->trackNumber())
- .arg(m_tracks.current()->firstSource()->sourceComment()),
+ .tqarg(m_tracks.current()->trackNumber())
+ .tqarg(m_tracks.current()->firstSource()->sourceComment()),
resultStringsUnique,
0,
false,
@@ -273,7 +273,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success )
// query next track
if( m_tracks.next() ) {
emit infoMessage( i18n("Generating fingerprint for track %1.")
- .arg(m_tracks.current()->trackNumber()), INFO );
+ .tqarg(m_tracks.current()->trackNumber()), INFO );
m_trmThread->track = m_tracks.current();
m_trmJob->start();
}
diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp
index e231ed7..66bd61a 100644
--- a/src/projects/k3bprojectburndialog.cpp
+++ b/src/projects/k3bprojectburndialog.cpp
@@ -31,7 +31,7 @@
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvbox.h>
#include <tqcheckbox.h>
#include <tqtabwidget.h>
@@ -199,10 +199,10 @@ void K3bProjectBurnDialog::slotStartClicked()
//
TQString tempDir = m_tempDirSelectionWidget->tempDirectory();
if( !TQFile::exists( tempDir ) ) {
- if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( tempDir ) )
+ if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( tempDir ) )
== KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( tempDir ) ) {
- KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( tempDir ) );
+ KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( tempDir ) );
return;
}
}
@@ -269,9 +269,9 @@ void K3bProjectBurnDialog::prepareGui()
m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode );
m_optionGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Settings"), w );
- m_optionGroup->layout()->setMargin(0);
- m_optionGroup->layout()->setSpacing(0);
- m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->layout() );
+ m_optionGroup->tqlayout()->setMargin(0);
+ m_optionGroup->tqlayout()->setSpacing(0);
+ m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->tqlayout() );
m_optionGroupLayout->setMargin( KDialog::marginHint() );
m_optionGroupLayout->setSpacing( KDialog::spacingHint() );
diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp
index 4c29b62..3f2434c 100644
--- a/src/projects/k3bvcdburndialog.cpp
+++ b/src/projects/k3bvcdburndialog.cpp
@@ -20,7 +20,7 @@
#include <tqradiobutton.h>
#include <tqlabel.h>
#include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqgrid.h>
@@ -69,7 +69,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
}
setTitle( vcdType, i18n( "1 MPEG (%1)", "%n MPEGs (%1)",
- m_vcdDoc->tracks() ->count() ).arg( KIO::convertSize( m_vcdDoc->size() ) ) );
+ m_vcdDoc->tracks() ->count() ).tqarg( KIO::convertSize( m_vcdDoc->size() ) ) );
const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager() ->binObject( "cdrecord" );
if ( cdrecordBin && cdrecordBin->hasFeature( "cuefile" ) )
@@ -95,13 +95,13 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
// ToolTips
// -------------------------------------------------------------------------
TQToolTip::add
- ( m_radioVcd11, i18n( "Select Video CD type %1" ).arg( "(VCD 1.1)" ) );
+ ( m_radioVcd11, i18n( "Select Video CD type %1" ).tqarg( "(VCD 1.1)" ) );
TQToolTip::add
- ( m_radioVcd20, i18n( "Select Video CD type %1" ).arg( "(VCD 2.0)" ) );
+ ( m_radioVcd20, i18n( "Select Video CD type %1" ).tqarg( "(VCD 2.0)" ) );
TQToolTip::add
- ( m_radioSvcd10, i18n( "Select Video CD type %1" ).arg( "(SVCD 1.0)" ) );
+ ( m_radioSvcd10, i18n( "Select Video CD type %1" ).tqarg( "(SVCD 1.0)" ) );
TQToolTip::add
- ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).arg( "(HQ-VCD 1.0)" ) );
+ ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).tqarg( "(HQ-VCD 1.0)" ) );
TQToolTip::add
( m_checkAutoDetect, i18n( "Automatic video type recognition." ) );
TQToolTip::add
@@ -231,7 +231,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
( m_editCdiCfg, i18n( "<p>Configuration parameters only available for VideoCD 2.0"
"<p>The engine works perfectly well when used as-is."
"<p>You have the option to configure the VCD application."
- "<p>You can adapt the color and/or the shape of the cursor and lots more." ) );
+ "<p>You can adapt the color and/or the tqshape of the cursor and lots more." ) );
TQWhatsThis::add
@@ -307,11 +307,11 @@ void K3bVcdBurnDialog::setupAdvancedTab()
// -------------------------------------------- gaps & margins group ----
m_groupGaps = new TQGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w );
- m_groupGaps->layout() ->setSpacing( spacingHint() );
- m_groupGaps->layout() ->setMargin( marginHint() );
+ m_groupGaps->tqlayout() ->setSpacing( spacingHint() );
+ m_groupGaps->tqlayout() ->setMargin( marginHint() );
- TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->layout() );
- groupGapsLayout->setAlignment( TQt::AlignTop );
+ TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() );
+ groupGapsLayout->tqsetAlignment( TQt::AlignTop );
m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps );
@@ -403,11 +403,11 @@ void K3bVcdBurnDialog::setupAdvancedTab()
// ------------------------------------------------------- misc group ----
m_groupMisc = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w );
- m_groupMisc->layout() ->setSpacing( spacingHint() );
- m_groupMisc->layout() ->setMargin( marginHint() );
+ m_groupMisc->tqlayout() ->setSpacing( spacingHint() );
+ m_groupMisc->tqlayout() ->setMargin( marginHint() );
- TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->layout() );
- groupMiscLayout->setAlignment( TQt::AlignTop );
+ TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() );
+ groupMiscLayout->tqsetAlignment( TQt::AlignTop );
m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" );
m_spinRestriction = new TQSpinBox( m_groupMisc, "m_spinRestriction" );
@@ -451,7 +451,7 @@ void K3bVcdBurnDialog::setupVideoCdTab()
m_checkNonCompliant->setEnabled( false );
m_checkNonCompliant->setChecked( false );
- m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).arg( "VCD 3.0" ), m_groupOptions );
+ m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).tqarg( "VCD 3.0" ), m_groupOptions );
// Only available on SVCD Type
m_checkVCD30interpretation->setEnabled( false );
m_checkVCD30interpretation->setChecked( false );
@@ -580,7 +580,7 @@ void K3bVcdBurnDialog::slotStartClicked()
{
if ( TQFile::exists( vcdDoc() ->vcdImage() ) ) {
- if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).arg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") )
+ if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).tqarg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") )
!= KMessageBox::Continue )
return ;
}
@@ -895,7 +895,7 @@ void K3bVcdBurnDialog::saveCdiConfig()
int i = m_editCdiCfg->numLines();
for ( int j = 0; j < i; j++ )
- s << TQString( "%1" ).arg( m_editCdiCfg->textLine( j ) ) << "\n";
+ s << TQString( "%1" ).tqarg( m_editCdiCfg->textLine( j ) ) << "\n";
cdi.close();
diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp
index 19f49fb..3232384 100644
--- a/src/projects/k3bvcdlistview.cpp
+++ b/src/projects/k3bvcdlistview.cpp
@@ -198,7 +198,7 @@ void K3bVcdListView::showPropertiesDialog()
TQPtrList<K3bVcdTrack> tracks = *m_doc->tracks();
K3bVcdTrackDialog d( m_doc, tracks, selected, this );
if ( d.exec() ) {
- repaint();
+ tqrepaint();
}
} else {
m_view->slotProperties();
diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp
index 62f2137..be140f7 100644
--- a/src/projects/k3bvcdtrackdialog.cpp
+++ b/src/projects/k3bvcdtrackdialog.cpp
@@ -22,7 +22,7 @@
#include <tqhbox.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqmultilineedit.h>
#include <tqpixmap.h>
#include <tqradiobutton.h>
@@ -70,7 +70,7 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& t
m_displayFileName->setText( selectedTrack->fileName() );
m_displayLength->setText( selectedTrack->duration() );
m_displaySize->setText( KIO::convertSize( selectedTrack->size() ) );
- m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) );
+ m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( selectedTrack->muxrate() ) );
if ( selectedTrack->isSegment() )
m_labelMimeType->setPixmap( SmallIcon( "image", KIcon::SizeMedium ) );
@@ -93,7 +93,7 @@ void K3bVcdTrackDialog::slotOk()
void K3bVcdTrackDialog::setPbcTrack( K3bVcdTrack* selected, K3bCutComboBox* box, int which )
{
// TODO: Unset Userdefined on default settings
- kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).arg( box->currentItem() ).arg( m_tracks.count() ) << endl;
+ kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).tqarg( box->currentItem() ).tqarg( m_tracks.count() ) << endl;
int count = m_tracks.count();
@@ -375,11 +375,11 @@ void K3bVcdTrackDialog::prepareGui()
// FILE-INFO BOX
///////////////////////////////////////////////////
TQGroupBox* groupFileInfo = new TQGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" );
- groupFileInfo->layout() ->setSpacing( 0 );
- groupFileInfo->layout() ->setMargin( 0 );
+ groupFileInfo->tqlayout() ->setSpacing( 0 );
+ groupFileInfo->tqlayout() ->setMargin( 0 );
- TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->layout() );
- groupFileInfoLayout->setAlignment( TQt::AlignTop );
+ TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() );
+ groupFileInfoLayout->tqsetAlignment( TQt::AlignTop );
groupFileInfoLayout->setSpacing( spacingHint() );
groupFileInfoLayout->setMargin( marginHint() );
@@ -387,7 +387,7 @@ void K3bVcdTrackDialog::prepareGui()
m_displayFileName = new KCutLabel( groupFileInfo );
m_displayFileName->setText( i18n( "Filename" ) );
- m_displayFileName->setAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) );
+ m_displayFileName->tqsetAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) );
TQLabel* labelSize = new TQLabel( i18n( "Size:" ), groupFileInfo, "labelSize" );
TQLabel* labelLength = new TQLabel( i18n( "Length:" ), groupFileInfo, "labelLength" );
@@ -395,15 +395,15 @@ void K3bVcdTrackDialog::prepareGui()
m_displaySize = new TQLabel( groupFileInfo, "m_displaySize" );
m_displaySize->setText( "0.0 MB" );
- m_displaySize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_displaySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_displayLength = new TQLabel( groupFileInfo, "m_displayLength" );
m_displayLength->setText( "0:0:0" );
- m_displayLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_displayLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" );
- m_muxrate->setText( i18n( "%1 bit/s" ).arg( 0 ) );
- m_muxrate->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( 0 ) );
+ m_muxrate->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
TQFrame* fileInfoLine = new TQFrame( groupFileInfo );
fileInfoLine->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
@@ -443,15 +443,15 @@ void K3bVcdTrackDialog::setupPbcTab()
TQWidget * w = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( w );
- grid->setAlignment( TQt::AlignTop );
+ grid->tqsetAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() );
//////////////////////////////////////////////////////////////////////////////////////////
TQGroupBox* groupOptions = new TQGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w );
- groupOptions->layout() ->setSpacing( spacingHint() );
- groupOptions->layout() ->setMargin( marginHint() );
+ groupOptions->tqlayout() ->setSpacing( spacingHint() );
+ groupOptions->tqlayout() ->setMargin( marginHint() );
m_check_pbc = new TQCheckBox( i18n( "Enable playback control (for the whole CD)" ), groupOptions, "m_check_pbc" );
@@ -463,11 +463,11 @@ void K3bVcdTrackDialog::setupPbcTab()
//////////////////////////////////////////////////////////////////////////////////////////
m_groupPlay = new TQGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w );
- m_groupPlay->layout() ->setSpacing( spacingHint() );
- m_groupPlay->layout() ->setMargin( marginHint() );
+ m_groupPlay->tqlayout() ->setSpacing( spacingHint() );
+ m_groupPlay->tqlayout() ->setMargin( marginHint() );
- TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->layout() );
- groupPlayLayout->setAlignment( TQt::AlignTop );
+ TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() );
+ groupPlayLayout->tqsetAlignment( TQt::AlignTop );
TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" );
@@ -499,11 +499,11 @@ void K3bVcdTrackDialog::setupPbcTab()
//////////////////////////////////////////////////////////////////////////////////////////
m_groupPbc = new TQGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w );
- m_groupPbc->layout() ->setSpacing( spacingHint() );
- m_groupPbc->layout() ->setMargin( marginHint() );
+ m_groupPbc->tqlayout() ->setSpacing( spacingHint() );
+ m_groupPbc->tqlayout() ->setMargin( marginHint() );
- TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->layout() );
- groupPbcLayout->setAlignment( TQt::AlignTop );
+ TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() );
+ groupPbcLayout->tqsetAlignment( TQt::AlignTop );
TQLabel* labelPbc_previous = new TQLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" );
TQLabel* labelPbc_next = new TQLabel( i18n( "Next:" ), m_groupPbc, "labelPbc_next" );
@@ -553,14 +553,14 @@ void K3bVcdTrackDialog::setupPbcKeyTab()
m_widgetnumkeys = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( m_widgetnumkeys );
- grid->setAlignment( TQt::AlignTop );
+ grid->tqsetAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() );
m_groupKey = new TQGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys );
m_groupKey->setEnabled( false );
- m_groupKey->layout() ->setSpacing( spacingHint() );
- m_groupKey->layout() ->setMargin( marginHint() );
+ m_groupKey->tqlayout() ->setSpacing( spacingHint() );
+ m_groupKey->tqlayout() ->setMargin( marginHint() );
m_list_keys = new K3bListView( m_groupKey, "m_list_keys" );
m_list_keys->setAllColumnsShowFocus( true );
@@ -590,7 +590,7 @@ void K3bVcdTrackDialog::setupAudioTab()
TQWidget * w = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( w );
- grid->setAlignment( TQt::AlignTop );
+ grid->tqsetAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() );
@@ -647,7 +647,7 @@ void K3bVcdTrackDialog::setupVideoTab()
TQWidget * w = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( w );
- grid->setAlignment( TQt::AlignTop );
+ grid->tqsetAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() );
@@ -744,9 +744,9 @@ TQString K3bVcdTrackDialog::displayName( K3bVcdTrack * track )
return i18n( "ItSelf" );
if ( track->isSegment() )
- return i18n( "Segment-%1 - %2" ).arg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() );
+ return i18n( "Segment-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() );
- return i18n( "Sequence-%1 - %2" ).arg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() );
+ return i18n( "Sequence-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() );
}
void K3bVcdTrackDialog::slotPlayTimeChanged( int value )
diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp
index da5ca89..2a42495 100644
--- a/src/projects/k3bvcdview.cpp
+++ b/src/projects/k3bvcdview.cpp
@@ -14,7 +14,7 @@
*/
// QT-includes
-#include <layout.h>
+#include <tqlayout.h>
#include <tqstring.h>
diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp
index e37fabd..c5adefb 100644
--- a/src/projects/k3bvideodvdburndialog.cpp
+++ b/src/projects/k3bvideodvdburndialog.cpp
@@ -32,7 +32,7 @@
#include <kio/global.h>
#include <kmessagebox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
@@ -46,7 +46,7 @@ K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *par
{
prepareGui();
- setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) );
+ setTitle( i18n("Video DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) );
// for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@@ -181,7 +181,7 @@ void K3bVideoDvdBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) {
// delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked
diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp
index 46c71e5..fbd3a91 100644
--- a/src/projects/k3bview.cpp
+++ b/src/projects/k3bview.cpp
@@ -15,7 +15,7 @@
// include files for TQt
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -87,7 +87,7 @@ K3bView::~K3bView()
void K3bView::setMainWidget( TQWidget* w )
{
- static_cast<TQGridLayout*>(layout())->addMultiCellWidget( w, 1, 1, 0, 1 );
+ static_cast<TQGridLayout*>(tqlayout())->addMultiCellWidget( w, 1, 1, 0, 1 );
}
diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui
index 66d34ea..5a7a15b 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>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
@@ -99,7 +99,7 @@ which can be used with programs like xmms or noatun.
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -148,7 +148,7 @@ file will contain all tracks one after the other.
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6_2</cstring>
+ <cstring>tqlayout6_2</cstring>
</property>
<hbox>
<property name="name">
@@ -164,7 +164,7 @@ file will contain all tracks one after the other.
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -231,7 +231,7 @@ file will contain all tracks one after the other.
<property name="text">
<string>-</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -250,7 +250,7 @@ file will contain all tracks one after the other.
<property name="text">
<string>-</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui
index 09d8062..feff67a 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>layout8</cstring>
+ <cstring>tqlayout8</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>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -123,7 +123,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>2</height>
@@ -137,7 +137,7 @@
<property name="text">
<string>See special strings</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -148,7 +148,7 @@
<property name="text">
<string>About conditional inclusion</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 0652e01..807e462 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -46,7 +46,7 @@
#include <kstandarddirs.h>
#include <kdialogbase.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqheader.h>
#include <tqlabel.h>
#include <tqframe.h>
@@ -67,7 +67,7 @@ public:
: K3bCheckListViewItem( parent, after ) {
setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) );
- setText( 3, i18n("Track %1").arg(_trackNumber) );
+ setText( 3, i18n("Track %1").tqarg(_trackNumber) );
setText( 4, " " + length.toString() + " " );
setText( 5, " " + KIO::convertSize( length.audioBytes() ) + " " );
@@ -111,7 +111,7 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name )
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
toolBoxLayout->addItem( spacer );
m_labelLength = new TQLabel( mainWidget() );
- m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
toolBoxLayout->addWidget( m_labelLength );
@@ -335,7 +335,7 @@ void K3bAudioCdView::slotEditTrackCddb()
if( !items.isEmpty() ) {
AudioTrackViewItem* a = static_cast<AudioTrackViewItem*>(items.first());
- KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").arg(a->trackNumber),
+ KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").tqarg(a->trackNumber),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true);
TQWidget* w = new TQWidget( &d );
@@ -359,7 +359,7 @@ void K3bAudioCdView::slotEditTrackCddb()
grid->setRowStretch( 4, 1 );
d.setMainWidget(w);
- d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
+ d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() );
if( d.exec() == TQDialog::Accepted ) {
m_cddbInfo.titles[a->trackNumber-1] = editTitle->text();
@@ -415,7 +415,7 @@ void K3bAudioCdView::slotEditAlbumCddb()
grid->setRowStretch( 7, 1 );
d.setMainWidget(w);
- d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
+ d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() );
if( d.exec() == TQDialog::Accepted ) {
m_cddbInfo.cdTitle = editTitle->text();
@@ -516,8 +516,8 @@ void K3bAudioCdView::slotSaveCddbLocally()
m_cddb->saveEntry( m_cddbInfo );
K3bPassivePopup::showPopup( i18n("Saved entry (%1) in category %2.")
- .arg(m_cddbInfo.discid)
- .arg(m_cddbInfo.category),
+ .tqarg(m_cddbInfo.discid)
+ .tqarg(m_cddbInfo.category),
i18n("CDDB") );
}
@@ -569,7 +569,7 @@ void K3bAudioCdView::updateDisplay()
m_labelLength->setText( i18n("1 track (%1)",
"%n tracks (%1)",
- m_toc.count()).arg(K3b::Msf(m_toc.length()).toString()) );
+ m_toc.count()).tqarg(K3b::Msf(m_toc.length()).toString()) );
}
@@ -584,7 +584,7 @@ void K3bAudioCdView::showBusyLabel( bool b )
// the themed label is a cut label, thus its size hint is
// based on the cut text, we force it to be full
m_busyInfoLabel->resize( width(), height() );
- m_busyInfoLabel->resize( m_busyInfoLabel->sizeHint() );
+ m_busyInfoLabel->resize( m_busyInfoLabel->tqsizeHint() );
int x = (width() - m_busyInfoLabel->width())/2;
int y = (height() - m_busyInfoLabel->height())/2;
TQRect r( TQPoint( x, y ), m_busyInfoLabel->size() );
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index 4cff284..60200e3 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -45,7 +45,7 @@
#include <tqheader.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqdir.h>
#include <tqstringlist.h>
#include <tqtabwidget.h>
@@ -79,7 +79,7 @@ K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* d
setTitle( i18n("Audio Project Conversion"),
i18n("1 track (%1)", "%n tracks (%1)",
- m_doc->numOfTracks()).arg(m_doc->length().toString()) );
+ m_doc->numOfTracks()).tqarg(m_doc->length().toString()) );
refresh();
}
diff --git a/src/rip/k3baudioprojectconvertingthread.cpp b/src/rip/k3baudioprojectconvertingthread.cpp
index fded45d..d0051e5 100644
--- a/src/rip/k3baudioprojectconvertingthread.cpp
+++ b/src/rip/k3baudioprojectconvertingthread.cpp
@@ -110,7 +110,7 @@ void K3bAudioProjectConvertingThread::run()
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -137,12 +137,12 @@ void K3bAudioProjectConvertingThread::run()
}
if( !isOpen ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
emitFinished(false);
return;
}
- emitInfoMessage( i18n("Converting to single file '%1'.").arg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Converting to single file '%1'.").tqarg(filename), K3bJob::INFO );
}
bool success = true;
@@ -155,7 +155,7 @@ void K3bAudioProjectConvertingThread::run()
break;
}
- emitInfoMessage( i18n("Successfully converted track %1.").arg(i+1), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully converted track %1.").tqarg(i+1), K3bJob::INFO );
track = track->next();
++i;
@@ -180,7 +180,7 @@ void K3bAudioProjectConvertingThread::run()
if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
TQFile::remove( m_tracks[d->currentTrackIndex].second );
- emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
+ emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
}
}
@@ -196,7 +196,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
{
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
return false;
}
@@ -226,7 +226,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
}
if( !isOpen ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
return false;
}
}
@@ -235,11 +235,11 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
if( !m_cddbEntry.artists[d->currentTrackIndex].isEmpty() &&
!m_cddbEntry.titles[d->currentTrackIndex].isEmpty() )
emitNewSubTask( i18n("Converting track %1 (%2 - %3)")
- .arg(d->currentTrackIndex+1)
- .arg(m_cddbEntry.artists[d->currentTrackIndex])
- .arg(m_cddbEntry.titles[d->currentTrackIndex]) );
+ .tqarg(d->currentTrackIndex+1)
+ .tqarg(m_cddbEntry.artists[d->currentTrackIndex])
+ .tqarg(m_cddbEntry.titles[d->currentTrackIndex]) );
else
- emitNewSubTask( i18n("Converting track %1").arg(d->currentTrackIndex+1) );
+ emitNewSubTask( i18n("Converting track %1").tqarg(d->currentTrackIndex+1) );
// do the conversion
@@ -265,7 +265,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
if( d->encoder->encode( buffer, readLength ) < 0 ) {
kdDebug() << "(K3bAudioProjectConvertingThread) error while encoding." << endl;
emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
- emitInfoMessage( i18n("Error while encoding track %1.").arg(d->currentTrackIndex+1), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while encoding track %1.").tqarg(d->currentTrackIndex+1), K3bJob::ERROR );
return false;
}
}
@@ -304,11 +304,11 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
return false;
}
- emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO );
TQFile f( m_playlistFilename );
if( f.open( IO_WriteOnly ) ) {
@@ -359,10 +359,10 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
}
}
- return ( t.device()->status() == IO_Ok );
+ return ( t.tqdevice()->status() == IO_Ok );
}
else {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR );
kdDebug() << "(K3bAudioProjectConvertingThread) could not open file " << m_playlistFilename << " for writing." << endl;
return false;
}
@@ -409,7 +409,7 @@ bool K3bAudioProjectConvertingThread::writeCueFile()
cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue";
- emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
return cueWriter.save( cueFile );
}
@@ -444,7 +444,7 @@ TQString K3bAudioProjectConvertingThread::jobDescription() const
if( m_cddbEntry.cdTitle.isEmpty() )
return i18n("Converting Audio Tracks");
else
- return i18n("Converting Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
+ return i18n("Converting Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle);
}
TQString K3bAudioProjectConvertingThread::jobDetails() const
@@ -452,7 +452,7 @@ TQString K3bAudioProjectConvertingThread::jobDetails() const
if( d->encoder )
return i18n("1 track (encoding to %1)",
"%n tracks (encoding to %1)",
- m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
+ m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType));
else
return i18n("1 track", "%n tracks", m_doc->numOfTracks() );
}
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index 4b99dc8..d1088ca 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -48,7 +48,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -106,7 +106,7 @@ K3bAudioRippingDialog::K3bAudioRippingDialog(const K3bDevice::Toc& toc,
}
setTitle( i18n("CD Ripping"),
i18n("1 track (%1)", "%n tracks (%1)",
- m_trackNumbers.count()).arg(length.toString()) );
+ m_trackNumbers.count()).tqarg(length.toString()) );
}
@@ -383,7 +383,7 @@ void K3bAudioRippingDialog::refresh()
m_patternWidget->blankReplaceString() ) + "." + extension;
}
else {
- filename = i18n("Track%1").arg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension;
+ filename = i18n("Track%1").tqarg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension;
}
filename = d->fsInfo.fixupPath( filename );
diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp
index c650755..9c410ad 100644
--- a/src/rip/k3baudioripthread.cpp
+++ b/src/rip/k3baudioripthread.cpp
@@ -150,7 +150,7 @@ void K3bAudioRipThread::run()
d->toc = m_device->readToc();
if( !d->paranoiaLib->initParanoia( m_device, d->toc ) ) {
- emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()),
+ emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()),
K3bJob::ERROR );
m_device->block(false);
@@ -158,7 +158,7 @@ void K3bAudioRipThread::run()
if( m_device->interfaceType() == K3bDevice::SCSI &&
!m_device->genericDevice().isEmpty() &&
!TQFileInfo( m_device->genericDevice() ).isWritable() )
- emitInfoMessage( i18n("You need write access to %1").arg( m_device->genericDevice() ), K3bJob::ERROR );
+ emitInfoMessage( i18n("You need write access to %1").tqarg( m_device->genericDevice() ), K3bJob::ERROR );
emitFinished(false);
return;
@@ -197,7 +197,7 @@ void K3bAudioRipThread::run()
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) {
d->paranoiaLib->close();
- emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
m_device->block(false);
emitFinished(false);
return;
@@ -226,13 +226,13 @@ void K3bAudioRipThread::run()
if( !isOpen ) {
d->paranoiaLib->close();
- emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
m_device->block(false);
emitFinished(false);
return;
}
- emitInfoMessage( i18n("Ripping to single file '%1'.").arg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Ripping to single file '%1'.").tqarg(filename), K3bJob::INFO );
}
emitInfoMessage( i18n("Starting digital audio extraction (ripping)."), K3bJob::INFO );
@@ -254,7 +254,7 @@ void K3bAudioRipThread::run()
if( success && !d->canceled ) {
TQString& filename = m_tracks[0].second;
- emitInfoMessage( i18n("Successfully ripped to %2.").arg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully ripped to %2.").tqarg(filename), K3bJob::INFO );
}
}
@@ -300,7 +300,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
return false;
}
@@ -330,16 +330,16 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
}
if( !isOpen ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
return false;
}
}
if( !m_cddbEntry.artists[track-1].isEmpty() &&
!m_cddbEntry.titles[track-1].isEmpty() )
- emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").arg(track).arg(m_cddbEntry.artists[track-1]).arg(m_cddbEntry.titles[track-1]) );
+ emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").tqarg(track).tqarg(m_cddbEntry.artists[track-1]).tqarg(m_cddbEntry.titles[track-1]) );
else
- emitNewSubTask( i18n("Ripping track %1").arg(track) );
+ emitNewSubTask( i18n("Ripping track %1").tqarg(track) );
int status;
while( 1 ) {
@@ -352,9 +352,9 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
if( status == K3bCdparanoiaLib::S_OK ) {
if( buf == 0 ) {
if( m_singleFile )
- emitInfoMessage( i18n("Successfully ripped track %1.").arg(track), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully ripped track %1.").tqarg(track), K3bJob::INFO );
else
- emitInfoMessage( i18n("Successfully ripped track %1 to %2.").arg(track).arg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully ripped track %1 to %2.").tqarg(track).tqarg(filename), K3bJob::INFO );
if( !m_singleFile ) {
if( d->encoder )
@@ -371,7 +371,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
CD_FRAMESIZE_RAW ) < 0 ) {
kdDebug() << "(K3bAudioRipThread) error while encoding." << endl;
emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
- emitInfoMessage( i18n("Error while encoding track %1.").arg(track), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while encoding track %1.").tqarg(track), K3bJob::ERROR );
return false;
}
}
@@ -387,7 +387,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
}
}
else {
- emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(track), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(track), K3bJob::ERROR );
return false;
}
}
@@ -435,7 +435,7 @@ void K3bAudioRipThread::cleanupAfterCancellation()
if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
TQFile::remove( m_tracks[d->currentTrackIndex].second );
- emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
+ emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
}
}
}
@@ -447,11 +447,11 @@ bool K3bAudioRipThread::writePlaylist()
TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
return false;
}
- emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO );
TQFile f( m_playlistFilename );
if( f.open( IO_WriteOnly ) ) {
@@ -502,10 +502,10 @@ bool K3bAudioRipThread::writePlaylist()
}
}
- return ( t.device()->status() == IO_Ok );
+ return ( t.tqdevice()->status() == IO_Ok );
}
else {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR );
kdDebug() << "(K3bAudioRipThread) could not open file " << m_playlistFilename << " for writing." << endl;
return false;
}
@@ -551,7 +551,7 @@ bool K3bAudioRipThread::writeCueFile()
cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue";
- emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
return cueWriter.save( cueFile );
}
@@ -586,7 +586,7 @@ TQString K3bAudioRipThread::jobDescription() const
if( m_cddbEntry.cdTitle.isEmpty() )
return i18n("Ripping Audio Tracks");
else
- return i18n("Ripping Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
+ return i18n("Ripping Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle);
}
TQString K3bAudioRipThread::jobDetails() const
@@ -594,7 +594,7 @@ TQString K3bAudioRipThread::jobDetails() const
if( d->encoder )
return i18n("1 track (encoding to %1)",
"%n tracks (encoding to %1)",
- m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
+ m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType));
else
return i18n("1 track", "%n tracks", m_tracks.count() );
}
diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp
index 89c9554..79e1375 100644
--- a/src/rip/k3bcddbpatternwidget.cpp
+++ b/src/rip/k3bcddbpatternwidget.cpp
@@ -26,14 +26,14 @@
#include <tqvalidator.h>
#include <tqwhatsthis.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name )
: base_K3bCddbPatternWidget( parent, name )
{
- // fix the layout
- ((TQGridLayout*)layout())->setRowStretch( 4, 1 );
+ // fix the tqlayout
+ ((TQGridLayout*)tqlayout())->setRowStretch( 4, 1 );
// setup validators
// there can never be one of the following characters in both dir and filename:
diff --git a/src/rip/k3bcuefilewriter.cpp b/src/rip/k3bcuefilewriter.cpp
index 8c46e96..2303926 100644
--- a/src/rip/k3bcuefilewriter.cpp
+++ b/src/rip/k3bcuefilewriter.cpp
@@ -21,7 +21,7 @@
#include <k3bversion.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqdatetime.h>
@@ -87,5 +87,5 @@ bool K3bCueFileWriter::save( TQTextStream& t )
i++;
}
- return ( t.device()->status() == IO_Ok );
+ return ( t.tqdevice()->status() == IO_Ok );
}
diff --git a/src/rip/k3bcuefilewriter.h b/src/rip/k3bcuefilewriter.h
index 998117e..cee821d 100644
--- a/src/rip/k3bcuefilewriter.h
+++ b/src/rip/k3bcuefilewriter.h
@@ -16,7 +16,7 @@
#ifndef _K3B_CUE_FILE_WRITER_H_
#define _K3B_CUE_FILE_WRITER_H_
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqstringlist.h>
#include <k3btoc.h>
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp
index 0ab14d8..d83fe49 100644
--- a/src/rip/k3bpatternparser.cpp
+++ b/src/rip/k3bpatternparser.cpp
@@ -119,7 +119,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s.replace( '*', '_' );
s.replace( '}', '*' ); // for conditional inclusion
dir.append( s.isEmpty()
- ? i18n("unknown") + TQString(" %1").arg(trackNumber)
+ ? i18n("unknown") + TQString(" %1").tqarg(trackNumber)
: s );
break;
case TITLE:
@@ -128,7 +128,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s.replace( '*', '_' );
s.replace( '}', '*' );
dir.append( s.isEmpty()
- ? i18n("Track %1").arg(trackNumber)
+ ? i18n("Track %1").tqarg(trackNumber)
: s );
break;
case NUMBER:
@@ -171,7 +171,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
dir.append( s ); // I think it makes more sense to allow empty comments
break;
case DATE:
- dir.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
+ dir.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) );
break;
default:
dir.append( pattern.mid(i, len) );
@@ -247,7 +247,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s = entry.cdExtInfo;
break;
case DATE:
- s = KGlobal::locale()->formatDate( TQDate::currentDate() );
+ s = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
break;
default: // we must never get here,
break; // all choices should be covered
diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp
index ace8fb2..89cdc37 100644
--- a/src/rip/k3bvideocdinfo.cpp
+++ b/src/rip/k3bvideocdinfo.cpp
@@ -177,7 +177,7 @@ void K3bVideoCdInfo::parseXmlData()
);
}
} else {
- kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).arg( tagName ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).tqarg( tagName ) << endl;
}
}
}
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index be91fa9..1248138 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -97,8 +97,8 @@ void K3bVideoCdRip::vcdxRip()
if ( !bin ) {
kdDebug() << "(K3bVideoCdRip) could not find vcdxrip executable" << endl;
- emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxrip" ), K3bJob::ERROR );
- emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).arg( ">= 0.7.12" ), K3bJob::INFO );
+ emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO );
emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll();
jobFinished( false );
@@ -107,7 +107,7 @@ void K3bVideoCdRip::vcdxRip()
if( bin->version < K3bVersion("0.7.12") ) {
kdDebug() << "(K3bVideoCdRip) vcdxrip executable too old!" << endl;
- emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).arg( "Vcdxrip" ).arg( "0.7.12" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).tqarg( "Vcdxrip" ).tqarg( "0.7.12" ), K3bJob::ERROR );
emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll();
jobFinished( false );
@@ -115,7 +115,7 @@ void K3bVideoCdRip::vcdxRip()
}
if ( !bin->copyright.isEmpty() )
- emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO );
+ emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO );
*m_process << k3bcore ->externalBinManager() ->binPath( "vcdxrip" );
@@ -142,10 +142,10 @@ void K3bVideoCdRip::vcdxRip()
if ( m_videooptions ->getVideoCdSector2336() )
*m_process << "--sector-2336";
- *m_process << "-i" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() );
+ *m_process << "-i" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() );
if ( m_videooptions ->getVideoCdExtractXml() )
- *m_process << "-o" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() );
+ *m_process << "-o" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() );
else
*m_process << "-o" << "/dev/null";
@@ -172,11 +172,11 @@ void K3bVideoCdRip::vcdxRip()
emit newTask( i18n( "Extracting" ) );
emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO );
- emit infoMessage( i18n( "Extract files from %1 to %2." ).arg( m_videooptions ->getVideoCdSource() ).arg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
+ emit infoMessage( i18n( "Extract files from %1 to %2." ).tqarg( m_videooptions ->getVideoCdSource() ).tqarg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl;
- emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
}
@@ -241,15 +241,15 @@ void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len )
if ( tel.isText() ) {
const TQString text = tel.data();
if ( level == "information" ) {
- kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).arg( text ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).tqarg( text ) << endl;
parseInformation( text );
} else {
if ( level != "error" ) {
- kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).arg( text ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).tqarg( text ) << endl;
emit debuggingOutput( "vcdxrip", text );
parseInformation( text );
} else {
- kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).arg( text ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).tqarg( text ) << endl;
emit infoMessage( text, K3bJob::ERROR );
}
}
@@ -269,14 +269,14 @@ void K3bVideoCdRip::slotVcdXRipFinished()
emit infoMessage( i18n( "Files successfully extracted." ), K3bJob::SUCCESS );
break;
default:
- emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxrip" ).arg( m_process->exitStatus() ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxrip" ).tqarg( m_process->exitStatus() ), K3bJob::ERROR );
emit infoMessage( i18n( "Please send me an email with the last output..." ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
return ;
}
} else {
- emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxrip" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
return ;
@@ -290,7 +290,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
// parse warning
if ( text.contains( "encountered non-form2 sector" ) ) {
// I think this is an error not a warning. Finish ripping with invalid mpegs.
- emit infoMessage( i18n( "%1 encountered non-form2 sector" ).arg("Vcdxrip"), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 encountered non-form2 sector" ).tqarg("Vcdxrip"), K3bJob::ERROR );
emit infoMessage( i18n( "leaving loop" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
@@ -326,7 +326,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
index = 11;
end = text.find( "(start lsn" );
- emit newSubTask( i18n( "Extracting %1" ).arg( text.mid( index, end - index ).stripWhiteSpace() ) );
+ emit newSubTask( i18n( "Extracting %1" ).tqarg( text.mid( index, end - index ).stripWhiteSpace() ) );
}
// parse extracting files info
// extracting CDI/CDI_IMAG.RTF to _cdi_cdi_imag.rtf (lsn 258, size 1315168, raw 1)
@@ -337,14 +337,14 @@ void K3bVideoCdRip::parseInformation( TQString text )
index = text.find( " to " );
end = text.find( " (lsn" );
TQString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace();
- emit newSubTask( i18n( "Extracting %1 to %2" ).arg( extractFileName ).arg( toFileName ) );
+ emit newSubTask( i18n( "Extracting %1 to %2" ).tqarg( extractFileName ).tqarg( toFileName ) );
}
}
}
TQString K3bVideoCdRip::jobDescription() const
{
- return i18n( "Extracting %1" ).arg( m_videooptions ->getVideoCdDescription() );
+ return i18n( "Extracting %1" ).tqarg( m_videooptions ->getVideoCdDescription() );
}
TQString K3bVideoCdRip::jobDetails() const
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index 2143cd0..9283f00 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -28,7 +28,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqdir.h>
@@ -73,11 +73,11 @@ void K3bVideoCdRippingDialog::setupGui()
// ---------------------------------------------------- Directory group ---
TQGroupBox* groupDirectory = new TQGroupBox( 0, Qt::Vertical, i18n( "Destination Directory" ), frame );
- groupDirectory->layout() ->setSpacing( KDialog::spacingHint() );
- groupDirectory->layout() ->setMargin( KDialog::marginHint() );
+ groupDirectory->tqlayout() ->setSpacing( KDialog::spacingHint() );
+ groupDirectory->tqlayout() ->setMargin( KDialog::marginHint() );
- TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->layout() );
- groupDirectoryLayout->setAlignment( TQt::AlignTop );
+ TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->tqlayout() );
+ groupDirectoryLayout->tqsetAlignment( TQt::AlignTop );
TQLabel* rippathLabel = new TQLabel( i18n( "Rip files to:" ), groupDirectory );
m_editDirectory = new KURLRequester( groupDirectory, "m_editDirectory" );
@@ -90,13 +90,13 @@ void K3bVideoCdRippingDialog::setupGui()
freeSpaceBox->setSpacing( KDialog::spacingHint() );
( void ) new TQLabel( i18n( "Free space in directory:" ), freeSpaceBox, "FreeSpaceLabel" );
m_labelFreeSpace = new TQLabel( " ", freeSpaceBox, "m_labelFreeSpace" );
- m_labelFreeSpace->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
TQHBox* necessarySizeBox = new TQHBox( groupDirectory );
necessarySizeBox->setSpacing( KDialog::spacingHint() );
( void ) new TQLabel( i18n( "Necessary storage size:" ), necessarySizeBox, "StorSize" );
m_labelNecessarySize = new TQLabel( " ", necessarySizeBox, "m_labelNecessarySize" );
- m_labelNecessarySize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelNecessarySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
groupDirectoryLayout->addWidget( rippathLabel, 0, 0 );
@@ -132,7 +132,7 @@ void K3bVideoCdRippingDialog::setupGui()
void K3bVideoCdRippingDialog::setupContextHelp()
{
- TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").arg( m_editDirectory ->url() ) );
+ TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").tqarg( m_editDirectory ->url() ) );
TQToolTip::add( m_labelNecessarySize, i18n("Necessary space for extracted files") );
@@ -157,10 +157,10 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQDir d;
d.setPath( m_editDirectory ->url() );
if( !d.exists() ) {
- if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( m_editDirectory->url() ) )
+ if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( m_editDirectory->url() ) )
== KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( m_editDirectory->url() ) ) {
- KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( m_editDirectory->url() ) );
+ KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( m_editDirectory->url() ) );
return;
}
}
@@ -170,7 +170,7 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQFileInfo* fi;
while ( ( fi = it.current() ) != 0 ) {
if ( fi ->fileName() != "." && fi ->fileName() != ".." )
- filesExists.append( TQString( "%1 (%2)" ).arg( TQFile::encodeName( fi ->fileName() ).data() ).arg( KIO::convertSize( fi ->size() ) ) );
+ filesExists.append( TQString( "%1 (%2)" ).tqarg( TQFile::encodeName( fi ->fileName() ).data() ).tqarg( KIO::convertSize( fi ->size() ) ) );
++it;
}
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index b44b9df..7fbe3b2 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -29,7 +29,7 @@
#include <tqframe.h>
#include <tqheader.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcursor.h>
#include <tqapplication.h>
@@ -68,7 +68,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
const K3b::Msf& length )
: TQListViewItem( parent )
{
- setText( 0, TQString( "%1. %2" ).arg( _trackNumber ).arg( id ) );
+ setText( 0, TQString( "%1. %2" ).tqarg( _trackNumber ).tqarg( id ) );
setText( 1, name );
if ( length > 0 ) {
setText( 2, length.toString() );
@@ -83,7 +83,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
void updateData( const K3bVideoCdInfoResultEntry& resultEntry )
{
- setText( 0, TQString( "%1. %2" ).arg( trackNumber ).arg( resultEntry.id ) );
+ setText( 0, TQString( "%1. %2" ).tqarg( trackNumber ).tqarg( resultEntry.id ) );
setText( 1, resultEntry.name );
}
@@ -153,7 +153,7 @@ K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name )
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
toolBoxLayout->addItem( spacer );
m_labelLength = new TQLabel( mainWidget() );
- m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
toolBoxLayout->addWidget( m_labelLength );
// the track view
@@ -232,7 +232,7 @@ void K3bVideoCdView::reloadMedium()
K3b::Msf length( ( *it ).length() );
sequenceSize += length;
m_videocdmpegsize += length.mode2Form2Bytes();
- ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).arg( index ), "", index, length );
+ ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).tqarg( index ), "", index, length );
} else {
K3b::Msf length( ( *it ).length() );
m_videocddatasize += length.mode2Form1Bytes();
@@ -314,7 +314,7 @@ void K3bVideoCdView::updateDisplay()
else
setTitle( i18n( "Video CD" ) );
- m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).arg( K3b::Msf( m_toc.length() ).toString() ) );
+ m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).tqarg( K3b::Msf( m_toc.length() ).toString() ) );
}
@@ -416,7 +416,7 @@ void K3bVideoCdView::startRip()
if ( m_videooptions ->getVideoCdRipSequences() )
videocdsize += m_videocdmpegsize;
- kdDebug() << TQString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").arg( videocdsize ) << endl;
+ kdDebug() << TQString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").tqarg( videocdsize ) << endl;
m_videooptions ->setVideoCdSize( videocdsize );
K3bVideoCdRippingDialog rip( m_videooptions, this );
rip.exec();
diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
index 5c22e83..864b798 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>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<hbox>
<property name="name">
@@ -106,7 +106,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<hbox>
<property name="name">
@@ -188,7 +188,7 @@
<property name="text">
<string>-</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -207,7 +207,7 @@
<property name="text">
<string>-</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -252,7 +252,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -326,7 +326,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout8</cstring>
+ <cstring>tqlayout8</cstring>
</property>
<hbox>
<property name="name">
@@ -372,7 +372,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -397,7 +397,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout10</cstring>
+ <cstring>tqlayout10</cstring>
</property>
<hbox>
<property name="name">
@@ -423,7 +423,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<hbox>
<property name="name">
@@ -464,7 +464,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>tqlayout14</cstring>
</property>
<hbox>
<property name="name">
@@ -509,13 +509,13 @@
<property name="text">
<string>See special strings</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout8</cstring>
+ <cstring>tqlayout8</cstring>
</property>
<hbox>
<property name="name">
@@ -560,7 +560,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>5</width>
<height>1</height>
@@ -663,7 +663,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>1</height>
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 81e484f..bcdb0f6 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -34,7 +34,7 @@
#include <kconfig.h>
#include <kmessagebox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqspinbox.h>
#include <tqstyle.h>
@@ -172,7 +172,7 @@ K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD&
setTitle( i18n("Video DVD Ripping"),
i18n("1 title from %1", "%n titles from %1", titles.count())
- .arg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) );
+ .tqarg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) );
// populate list map
populateTitleView( titles );
@@ -195,13 +195,13 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
titleItem = new TQCheckListItem( m_w->m_titleView,
titleItem,
i18n("Title %1 (%2)")
- .arg(*it)
- .arg(m_dvd[*it-1].playbackTime().toString()),
+ .tqarg(*it)
+ .tqarg(m_dvd[*it-1].playbackTime().toString()),
TQCheckListItem::RadioButtonController );
titleItem->setText( 1, TQString("%1x%2")
- .arg(m_dvd[*it-1].videoStream().realPictureWidth())
- .arg(m_dvd[*it-1].videoStream().realPictureHeight()) );
- titleItem->setText( 3, TQString("%1 Title %2.avi").arg(m_dvd.volumeIdentifier()).arg(*it) );
+ .tqarg(m_dvd[*it-1].videoStream().realPictureWidth())
+ .tqarg(m_dvd[*it-1].videoStream().realPictureHeight()) );
+ titleItem->setText( 3, TQString("%1 Title %2.avi").tqarg(m_dvd.volumeIdentifier()).tqarg(*it) );
// now for the rip info
K3bVideoDVDRippingJob::TitleRipInfo ri( *it );
@@ -222,18 +222,18 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
TQListViewItem* asI = 0;
for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) {
TQString text = i18n("%1 %2Ch (%3%4)")
- .arg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) )
- .arg( m_dvd[*it-1].audioStream(i).channels() )
- .arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty()
+ .tqarg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) )
+ .tqarg( m_dvd[*it-1].audioStream(i).channels() )
+ .tqarg( m_dvd[*it-1].audioStream(i).langCode().isEmpty()
? i18n("unknown language")
: KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) )
- .arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
+ .tqarg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() )
: TQString() );
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 = tqstyle().tqpixelMetric( 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") + ")" );
@@ -302,7 +302,7 @@ void K3bVideoDVDRippingDialog::slotUpdateVideoSizes()
for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin();
it != m_titleRipInfos.end(); ++it ) {
TQSize s( resizeTitle( m_dvd[it.data().title-1].videoStream(), size ) );
- it.key()->setText( 1, TQString("%1x%2").arg(s.width()).arg(s.height()) );
+ it.key()->setText( 1, TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) );
}
}
@@ -456,12 +456,12 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
break;
case PATTERN_ORIG_VIDEO_SIZE:
f.append( TQString("%1x%2")
- .arg(title.videoStream().pictureWidth())
- .arg(title.videoStream().pictureHeight()) );
+ .tqarg(title.videoStream().pictureWidth())
+ .tqarg(title.videoStream().pictureHeight()) );
break;
case PATTERN_VIDEO_SIZE: {
TQSize s( resizeTitle( m_dvd[info.title-1].videoStream(), m_w->selectedPictureSize() ) );
- f.append( TQString("%1x%2").arg(s.width()).arg(s.height()) );
+ f.append( TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) );
break;
}
case PATTERN_ASPECT_RATIO:
@@ -471,7 +471,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
f.append( "16:9" );
break;
case PATTERN_CURRENT_DATE:
- f.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
+ f.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) );
break;
default:
f.append( pattern[i-1] );
diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp
index f17b6ff..bc08f3e 100644
--- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp
@@ -115,8 +115,8 @@ TQString K3bVideoDVDRippingJob::jobDescription() const
TQString K3bVideoDVDRippingJob::jobDetails() const
{
return i18n("Transcoding %n title to %1/%2", "Transcoding %n titles to %1/%2", m_titleRipInfos.count() )
- .arg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) )
- .arg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) );
+ .tqarg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) )
+ .tqarg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) );
}
@@ -143,10 +143,10 @@ void K3bVideoDVDRippingJob::slotTranscodingJobFinished( bool success )
}
else {
if( success )
- emit infoMessage( i18n("Successfully ripped title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
+ emit infoMessage( i18n("Successfully ripped title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
else {
d->failedTitles++;
- emit infoMessage( i18n("Failed to rip title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
+ emit infoMessage( i18n("Failed to rip title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
}
++d->currentTitleInfoIndex ;
@@ -176,11 +176,11 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success )
m_titleRipInfos[d->currentTitleInfoIndex].clipRight = 0;
if( success ) {
- emit infoMessage( i18n("Determined clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
+ emit infoMessage( i18n("Determined clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
emit infoMessage( i18n("Top: %1, Bottom: %2")
- .arg(m_detectClippingJob->clippingTop()).arg(m_detectClippingJob->clippingBottom()), INFO );
+ .tqarg(m_detectClippingJob->clippingTop()).tqarg(m_detectClippingJob->clippingBottom()), INFO );
emit infoMessage( i18n("Left: %1, Right: %2")
- .arg(m_detectClippingJob->clippingLeft()).arg(m_detectClippingJob->clippingRight()), INFO );
+ .tqarg(m_detectClippingJob->clippingLeft()).tqarg(m_detectClippingJob->clippingRight()), INFO );
// let's see if the clipping values make sense
if( m_detectClippingJob->clippingTop() + m_detectClippingJob->clippingBottom()
@@ -197,7 +197,7 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success )
}
}
else
- emit infoMessage( i18n("Failed to determine clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
+ emit infoMessage( i18n("Failed to determine clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
startTranscoding( d->currentTitleInfoIndex );
}
diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
index 2081d32..577b674 100644
--- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
@@ -77,11 +77,11 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv
m_process = new KProcess();
*m_process << bin->path;
*m_process << "-i" << dvd.device()->blockDeviceName();
- *m_process << "-T" << TQString("%1,%2").arg(title).arg(chapter);
+ *m_process << "-T" << TQString("%1,%2").tqarg(title).tqarg(chapter);
*m_process << "-x" << "dvd,null";
*m_process << "--dvd_access_delay" << "0";
*m_process << "-y" << "ppm,null";
- *m_process << "-c" << TQString("%1-%2").arg( frame ).arg( frame+1 );
+ *m_process << "-c" << TQString("%1-%2").tqarg( frame ).tqarg( frame+1 );
*m_process << "-Z" << "x200";
*m_process << "-o" << m_tempDir->name();
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index 34af9c9..5811750 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -45,12 +45,12 @@ static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int
s += "<br>";
s += TQString::number(i+1) + ": "
+ i18n("%1 %2Ch (%3<em>%4</em>)")
- .arg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) )
- .arg( title.audioStream(i).channels() )
- .arg( title.audioStream(i).langCode().isEmpty()
+ .tqarg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) )
+ .tqarg( title.audioStream(i).channels() )
+ .tqarg( title.audioStream(i).langCode().isEmpty()
? i18n("unknown language")
: KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) )
- .arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
+ .tqarg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() )
: TQString() );
}
@@ -69,13 +69,13 @@ static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigne
s += "<br>";
s += TQString::number(i+1) + ": "
+ TQString("%1 (%2<em>%3</em>)")
- .arg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE
+ .tqarg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE
? i18n("RLE")
: i18n("Extended") )
- .arg( title.subPictureStream(i).langCode().isEmpty()
+ .tqarg( title.subPictureStream(i).langCode().isEmpty()
? i18n("unknown language")
: KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) )
- .arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED
+ .tqarg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() )
: TQString() );
}
@@ -137,7 +137,7 @@ public:
m_previewSet = true;
- repaint();
+ tqrepaint();
}
const TQImage& preview() const {
@@ -243,18 +243,18 @@ private:
// Title X + length
return i18n("<p><b>Title %1 (%2)</b><br>"
"%3")
- .arg( m_title.titleNumber(), 2 )
- .arg( m_title.playbackTime().toString( false ) )
- .arg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) );
+ .tqarg( m_title.titleNumber(), 2 )
+ .tqarg( m_title.playbackTime().toString( false ) )
+ .tqarg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) );
case 3:
// video stream info
return TQString("<p>%1 %2x%3<br>%4%5")
- .arg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") )
- .arg( m_title.videoStream().pictureWidth() )
- .arg( m_title.videoStream().pictureHeight() )
- .arg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" )
- .arg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"):
+ .tqarg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") )
+ .tqarg( m_title.videoStream().pictureWidth() )
+ .tqarg( m_title.videoStream().pictureHeight() )
+ .tqarg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" )
+ .tqarg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"):
m_title.videoStream().permittedDf() == K3bVideoDVD::VIDEO_PERMITTED_DF_LETTERBOXED
? TQString(" - <em>") + i18n("anamorph") + TQString("</em>") : TQString() );
@@ -300,7 +300,7 @@ public:
return;
int col = m_view->header()->sectionAt( contentsPos.x() );
- TQRect r = m_view->itemRect( item );
+ TQRect r = m_view->tqitemRect( item );
int headerPos = m_view->header()->sectionPos( col );
r.setLeft( headerPos );
r.setRight( headerPos + m_view->header()->sectionSize( col ) );
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp
index 6ecc076..101d965 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp
@@ -27,7 +27,7 @@
#include <k3bexternalbinmanager.h>
#include <tqcursor.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <kapplication.h>
@@ -54,7 +54,7 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
toolBoxLayout->addItem( spacer );
m_labelLength = new TQLabel( mainWidget() );
- m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
toolBoxLayout->addWidget( m_labelLength );
@@ -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 layout
+ // general tqlayout
// ----------------------------------------------------------------------------------
mainGrid->addLayout( toolBoxLayout, 0, 0 );
mainGrid->addWidget( m_titleView, 1, 0 );
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 266d1b0..d05f915 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -36,7 +36,7 @@
#include <tqwidgetstack.h>
#include <tqpushbutton.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
static const int s_mp3Bitrates[] = {
@@ -86,7 +86,7 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent )
//
// Example filename pattern
//
- m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).arg(i18n("Title") ) );
+ m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).tqarg(i18n("Title") ) );
m_comboFilenamePattern->insertItem( TQString( "%{volumeid} (%{title})" ) );
@@ -94,7 +94,7 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent )
// Add the Audio bitrates
//
for( int i = 0; s_mp3Bitrates[i]; ++i )
- m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).arg(s_mp3Bitrates[i]) );
+ m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_mp3Bitrates[i]) );
for( int i = 0; i < K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_NUM_ENTRIES; ++i ) {
@@ -187,8 +187,8 @@ void K3bVideoDVDRippingWidget::setSelectedPictureSize( const TQSize& size )
else {
m_comboVideoSize->changeItem( i18n(s_pictureSizeNames[PICTURE_SIZE_CUSTOM])
+ TQString(" (%1x%2)")
- .arg(size.width() == 0 ? i18n("auto") : TQString::number(size.width()))
- .arg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())),
+ .tqarg(size.width() == 0 ? i18n("auto") : TQString::number(size.width()))
+ .tqarg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())),
PICTURE_SIZE_CUSTOM );
m_comboVideoSize->setCurrentItem( PICTURE_SIZE_CUSTOM );
}
@@ -351,8 +351,8 @@ void K3bVideoDVDRippingWidget::slotCustomPictureSize()
spinHeight->setSpecialValueText( i18n("Auto") );
TQLabel* labelW = new TQLabel( spinWidth, i18n("Width") + ':', dlg.plainPage() );
TQLabel* labelH = new TQLabel( spinHeight, i18n("Height") + ':', dlg.plainPage() );
- labelW->setAlignment( TQt::AlignRight|TQt::AlignVCenter );
- labelH->setAlignment( TQt::AlignRight|TQt::AlignVCenter );
+ labelW->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter );
+ labelH->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter );
TQGridLayout* grid = new TQGridLayout( dlg.plainPage() );
grid->setMargin( 0 );