summaryrefslogtreecommitdiffstats
path: root/k9author
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:29:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:29:54 -0600
commitb8a4f26c42f6d41e8251b60357f1a6990c1e8ad8 (patch)
tree9beca7fe1a592f5f49be1e0bb4d03f0dfc1829c7 /k9author
parent23c5272c1c49acf0906f7c97a524333705f7be46 (diff)
downloadk9copy-b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.tar.gz
k9copy-b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'k9author')
-rw-r--r--k9author/chapterEdit.cpp30
-rw-r--r--k9author/chapterEdit.ui12
-rw-r--r--k9author/import.cpp20
-rw-r--r--k9author/import.ui6
-rw-r--r--k9author/k9avidecode.cpp6
-rw-r--r--k9author/k9chapteredit.cpp2
-rw-r--r--k9author/k9menu.cpp6
-rw-r--r--k9author/k9menuedit.cpp18
-rw-r--r--k9author/k9newdvd.cpp14
-rw-r--r--k9author/k9newtitle.cpp8
-rw-r--r--k9author/menuEdit.cpp20
-rw-r--r--k9author/menuEdit.ui6
-rw-r--r--k9author/newTitle.cpp34
-rw-r--r--k9author/newTitle.ui10
14 files changed, 96 insertions, 96 deletions
diff --git a/k9author/chapterEdit.cpp b/k9author/chapterEdit.cpp
index 04eec11..0c14441 100644
--- a/k9author/chapterEdit.cpp
+++ b/k9author/chapterEdit.cpp
@@ -17,7 +17,7 @@
#include <kpushbutton.h>
#include <tqcheckbox.h>
#include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "ktimewidget.h"
@@ -34,11 +34,11 @@ chapterEdit::chapterEdit( TQWidget* parent, const char* name, WFlags fl )
{
if ( !name )
setName( "chapterEdit" );
- tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
chapterEditLayout = new TQGridLayout( this, 1, 1, 11, 6, "chapterEditLayout");
twstart = new KTimeWidget( this, "twstart" );
- twstart->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twstart->sizePolicy().hasHeightForWidth() ) );
+ twstart->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twstart->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( twstart, 1, 2 );
@@ -51,13 +51,13 @@ chapterEdit::chapterEdit( TQWidget* parent, const char* name, WFlags fl )
chapterEditLayout->addWidget( textLabel3, 0, 1 );
urFile = new KURLRequester( this, "urFile" );
- urFile->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)5, 0, 0, urFile->sizePolicy().hasHeightForWidth() ) );
+ urFile->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)5, 0, 0, urFile->sizePolicy().hasHeightForWidth() ) );
urFile->setMinimumSize( TQSize( 200, 0 ) );
chapterEditLayout->addMultiCellWidget( urFile, 0, 0, 2, 4 );
bStart = new KPushButton( this, "bStart" );
- bStart->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStart->sizePolicy().hasHeightForWidth() ) );
+ bStart->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStart->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( bStart, 1, 3 );
spacer2 = new TQSpacerItem( 16, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -78,44 +78,44 @@ chapterEdit::chapterEdit( TQWidget* parent, const char* name, WFlags fl )
chapterEditLayout->addMultiCellWidget( ckBreakEnd, 5, 5, 2, 3 );
twend = new KTimeWidget( this, "twend" );
- twend->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twend->sizePolicy().hasHeightForWidth() ) );
+ twend->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twend->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( twend, 4, 2 );
spacer3 = new TQSpacerItem( 20, 31, TQSizePolicy::Minimum, TQSizePolicy::Fixed );
chapterEditLayout->addItem( spacer3, 3, 2 );
- tqlayout3 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout3");
+ layout3 = new TQGridLayout( 0, 1, 1, 0, 6, "layout3");
lPosition = new TQLabel( this, "lPosition" );
- lPosition->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lPosition->sizePolicy().hasHeightForWidth() ) );
+ lPosition->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lPosition->sizePolicy().hasHeightForWidth() ) );
- tqlayout3->addWidget( lPosition, 1, 1 );
+ layout3->addWidget( lPosition, 1, 1 );
slider = new TQSlider( this, "slider" );
slider->setOrientation( Qt::Horizontal );
- tqlayout3->addWidget( slider, 1, 0 );
+ layout3->addWidget( slider, 1, 0 );
image = new TQLabel( this, "image" );
image->setMinimumSize( TQSize( 320, 200 ) );
image->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) );
image->setScaledContents( TRUE );
- tqlayout3->addMultiCellWidget( image, 0, 0, 0, 1 );
+ layout3->addMultiCellWidget( image, 0, 0, 0, 1 );
- chapterEditLayout->addMultiCellLayout( tqlayout3, 0, 6, 0, 0 );
+ chapterEditLayout->addMultiCellLayout( layout3, 0, 6, 0, 0 );
bEnd = new KPushButton( this, "bEnd" );
- bEnd->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bEnd->sizePolicy().hasHeightForWidth() ) );
+ bEnd->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bEnd->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( bEnd, 4, 3 );
bTitleButton = new TQPushButton( this, "bTitleButton" );
- bTitleButton->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bTitleButton->sizePolicy().hasHeightForWidth() ) );
+ bTitleButton->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bTitleButton->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( bTitleButton, 7, 0 );
languageChange();
- resize( TQSize(627, 300).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(627, 300).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/k9author/chapterEdit.ui b/k9author/chapterEdit.ui
index 1307bdc..2d7e337 100644
--- a/k9author/chapterEdit.ui
+++ b/k9author/chapterEdit.ui
@@ -68,7 +68,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>60</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -185,7 +185,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="7" colspan="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -219,7 +219,7 @@
<property name="name">
<cstring>image</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>320</width>
<height>200</height>
diff --git a/k9author/import.cpp b/k9author/import.cpp
index 69ebdbc..294192c 100644
--- a/k9author/import.cpp
+++ b/k9author/import.cpp
@@ -17,7 +17,7 @@
#include <kcombobox.h>
#include <tqcombobox.h>
#include <kselect.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "kcombobox.h"
@@ -35,43 +35,43 @@ import::import( TQWidget* parent, const char* name, WFlags fl )
importLayout = new TQGridLayout( this, 1, 1, 11, 6, "importLayout");
textLabel1 = new TQLabel( this, "textLabel1" );
- textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
importLayout->addWidget( textLabel1, 0, 0 );
- tqlayout2 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout2");
+ layout2 = new TQGridLayout( 0, 1, 1, 0, 6, "layout2");
lvDVD = new TQListView( this, "lvDVD" );
lvDVD->addColumn( tr2i18n( "Video files" ) );
lvDVD->header()->setClickEnabled( FALSE, lvDVD->header()->count() - 1 );
lvDVD->addColumn( tr2i18n( "..." ) );
lvDVD->header()->setClickEnabled( FALSE, lvDVD->header()->count() - 1 );
- lvDVD->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, lvDVD->sizePolicy().hasHeightForWidth() ) );
+ lvDVD->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, lvDVD->sizePolicy().hasHeightForWidth() ) );
lvDVD->setMinimumSize( TQSize( 0, 200 ) );
lvDVD->setRootIsDecorated( FALSE );
lvDVD->setResizeMode( TQListView::AllColumns );
- tqlayout2->addMultiCellWidget( lvDVD, 0, 1, 0, 0 );
+ layout2->addMultiCellWidget( lvDVD, 0, 1, 0, 0 );
- importLayout->addMultiCellLayout( tqlayout2, 1, 1, 0, 3 );
+ importLayout->addMultiCellLayout( layout2, 1, 1, 0, 3 );
cbOutputDev = new KComboBox( FALSE, this, "cbOutputDev" );
importLayout->addWidget( cbOutputDev, 0, 1 );
cbFormat = new TQComboBox( FALSE, this, "cbFormat" );
- cbFormat->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbFormat->sizePolicy().hasHeightForWidth() ) );
+ cbFormat->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbFormat->sizePolicy().hasHeightForWidth() ) );
importLayout->addWidget( cbFormat, 0, 2 );
lTotal = new TQLabel( this, "lTotal" );
- lTotal->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotal->sizePolicy().hasHeightForWidth() ) );
+ lTotal->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotal->sizePolicy().hasHeightForWidth() ) );
importLayout->addWidget( lTotal, 2, 3 );
gsTotal = new KGradientSelector( this, "gsTotal" );
gsTotal->setEnabled( FALSE );
- gsTotal->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gsTotal->sizePolicy().hasHeightForWidth() ) );
+ gsTotal->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gsTotal->sizePolicy().hasHeightForWidth() ) );
gsTotal->setMaximumSize( TQSize( 32767, 13 ) );
gsTotal->setValue( 0 );
gsTotal->setMaxValue( 180 );
@@ -80,7 +80,7 @@ import::import( TQWidget* parent, const char* name, WFlags fl )
importLayout->addMultiCellWidget( gsTotal, 2, 2, 0, 2 );
languageChange();
- resize( TQSize(524, 416).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(524, 416).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/k9author/import.ui b/k9author/import.ui
index 4569542..9047514 100644
--- a/k9author/import.ui
+++ b/k9author/import.ui
@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -77,7 +77,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>200</height>
@@ -151,7 +151,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>13</height>
diff --git a/k9author/k9avidecode.cpp b/k9author/k9avidecode.cpp
index 1ac2f4e..d4d2cdb 100644
--- a/k9author/k9avidecode.cpp
+++ b/k9author/k9avidecode.cpp
@@ -54,11 +54,11 @@ k9AviDecode::k9AviDecode(TQObject *parent, const char *name)
FormatHandle=dlopen("libavformat.so",RTLD_LAZY | RTLD_GLOBAL);
}
if (!CodecHandle) {
- m_error =i18n("Cannot open then library %1").tqarg("libavcodec");
+ m_error =i18n("Cannot open then library %1").arg("libavcodec");
return;
}
if (!FormatHandle) {
- m_error =i18n("Cannot open then library %1").tqarg("libavformat");
+ m_error =i18n("Cannot open then library %1").arg("libavformat");
return;
}
m_error="";
@@ -111,7 +111,7 @@ bool k9AviDecode::open(const TQString & _fileName) {
// Open video file
if (av_open_input_file(&m_FormatCtx, _fileName.utf8(), NULL, 0, NULL)!=0) {
- m_error=i18n("Couldn't open the file %1").tqarg(_fileName);
+ m_error=i18n("Couldn't open the file %1").arg(_fileName);
return false; // Couldn't open file}
}
// Retrieve stream information
diff --git a/k9author/k9chapteredit.cpp b/k9author/k9chapteredit.cpp
index 3453cf5..a066dab 100644
--- a/k9author/k9chapteredit.cpp
+++ b/k9author/k9chapteredit.cpp
@@ -17,7 +17,7 @@
#include <tqlabel.h>
#include <tqpixmap.h>
#include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kurlrequester.h>
#include <tqcheckbox.h>
#include "k9title.h"
diff --git a/k9author/k9menu.cpp b/k9author/k9menu.cpp
index 82e1010..26a399c 100644
--- a/k9author/k9menu.cpp
+++ b/k9author/k9menu.cpp
@@ -25,7 +25,7 @@ k9Menu::k9Menu(TQObject *parent, const char *name)
m_canvas=new TQCanvas(this);
TQPixmap pix(720,576);
pix.fill(TQt::black);
- m_canvas->tqsetBackgroundPixmap(pix);
+ m_canvas->setBackgroundPixmap(pix);
m_startScript=m_startScript2=m_endScript="";
}
@@ -202,7 +202,7 @@ void k9Menu::spumux(const TQString &_hiFileName,const TQString &_mpgFileName) {
for (k9MenuButton *button=m_buttons.first();button;button=m_buttons.next()) {
TQDomElement eButton = xml.createElement("button");
spu.appendChild(eButton);
- eButton.setAttribute("name",TQString("button%1").tqarg(i));
+ eButton.setAttribute("name",TQString("button%1").arg(i));
eButton.setAttribute("x0", TQString::number(button->getLeft()));
eButton.setAttribute("y0",TQString::number(button->getTop()));
eButton.setAttribute("x1",TQString::number(button->getLeft()+button->getWidth()));
@@ -261,7 +261,7 @@ void k9Menu::appendMenu(TQDomElement *_rootNode) {
pgc.appendChild(eButton);
TQDomText eButtonTxt=doc.createTextNode(button->getScript());
eButton.appendChild(eButtonTxt);
- eButton.setAttribute("name",TQString("button%1").tqarg(i));
+ eButton.setAttribute("name",TQString("button%1").arg(i));
i++;
}
diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp
index e9a018b..b50bcc9 100644
--- a/k9author/k9menuedit.cpp
+++ b/k9author/k9menuedit.cpp
@@ -17,7 +17,7 @@
#include "k9title.h"
#include "k9newdvd.h"
#include <tqwmatrix.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kfontdialog.h>
#include "k9menubutton.h"
#include <kurlrequester.h>
@@ -153,7 +153,7 @@ void k9MenuEdit::cbPosTitleActivated(int _value) {
void k9MenuEdit::setBackgroundImage(const TQImage &_image) {
m_background=_image;
- m_canvas->tqsetBackgroundPixmap(TQPixmap(_image));
+ m_canvas->setBackgroundPixmap(TQPixmap(_image));
emit backgroundImageChanged(_image);
}
@@ -219,7 +219,7 @@ void k9MenuEdit::setFormat(const eFormat& _value) {
TQImage img=pix.convertToImage().smoothScale(720,m_imageHeight);
m_canvas->resize(720,m_imageHeight);
m_menuEditor->setMaximumSize(TQSize(724,m_imageHeight+4));
- m_canvas->tqsetBackgroundPixmap(TQPixmap(img));
+ m_canvas->setBackgroundPixmap(TQPixmap(img));
}
@@ -242,7 +242,7 @@ void k9MenuEdit::titleSelected(k9Title *_title) {
disconnect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),0,0);
cbEnd->setEnabled(true);
m_menuEditor->clearSelection();
- lTitle->setText(i18n("Title %1 Menu").tqarg(_title->getNum()+1));
+ lTitle->setText(i18n("Title %1 Menu").arg(_title->getNum()+1));
setCanvas(_title->getMenu()->getCanvas());
m_menuType=TITLEMENU;
cbStart->clear();
@@ -266,8 +266,8 @@ void k9MenuEdit::titleSelected(k9Title *_title) {
k9NewDVD *newDVD=(k9NewDVD*)_title->parent() ;
k9NewDVDItems *items=newDVD->getTitles();
for (k9Title *title=items->first();title;title=items->next()) {
- cbEnd->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1));
- TQString script=TQString("g6=%1; call vmgm menu;" ).tqarg(title->getNum()+1);
+ cbEnd->insertItem(i18n("Play Title %1").arg(title->getNum()+1));
+ TQString script=TQString("g6=%1; call vmgm menu;" ).arg(title->getNum()+1);
m_endScripts << script;
}
for (int i=0;i<m_endScripts.count();i++ ){
@@ -292,9 +292,9 @@ void k9MenuEdit::rootSelected(k9NewDVD *_newDVD) {
m_startScripts << "";
k9NewDVDItems *items=_newDVD->getTitles();
for (k9Title *title=items->first();title;title=items->next()) {
- cbStart->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1));
- // TQString script=TQString("if (g5==0) {g5=1; jump title %1;}" ).tqarg(title->getNum()+1);
- TQString script=TQString("g6=%1;" ).tqarg(title->getNum()+1);
+ cbStart->insertItem(i18n("Play Title %1").arg(title->getNum()+1));
+ // TQString script=TQString("if (g5==0) {g5=1; jump title %1;}" ).arg(title->getNum()+1);
+ TQString script=TQString("g6=%1;" ).arg(title->getNum()+1);
m_startScripts << script;
if (script==_newDVD->getRootMenu()->getStartScript())
cbStart->setCurrentItem(cbStart->count()-1);
diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp
index e4c747f..5e7d085 100644
--- a/k9author/k9newdvd.cpp
+++ b/k9author/k9newdvd.cpp
@@ -14,7 +14,7 @@
#include "k9tools.h"
#include <tqfile.h>
#include <stdio.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kstandarddirs.h>
#include <tqapplication.h>
#include <ktempfile.h>
@@ -157,7 +157,7 @@ void k9NewDVD::addTitles (TQDomElement &_root) {
TQString menuFileName=m_workDir+KApplication::randomString(8)+".mpg";
m_tmpFiles << menuFileName,
menu->setMenuFileName(menuFileName);
- m_processList->addProgress(i18n("Creating menu for title %1").tqarg(title->getNum()+1));
+ m_processList->addProgress(i18n("Creating menu for title %1").arg(title->getNum()+1));
menu->createMenus(&titleSet);
TQDomElement eTitle=m_xml->createElement("titles");
@@ -244,7 +244,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *
break;
}
- k9Process *process=m_processList->addProcess(i18n("Encoding %1").tqarg(_aviFile->getFileName()));
+ k9Process *process=m_processList->addProcess(i18n("Encoding %1").arg(_aviFile->getFileName()));
m_processList->setFileName(process,_aviFile->getFileName());
TQTime t(0,0);
@@ -255,7 +255,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *
//m_process->clearArguments();
*process << "mencoder" << "-oac" << "lavc" << "-ovc" << "lavc" << "-of" << "mpeg" <<"-afm" <<"libmad";
*process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000";
- *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").tqarg(m_videoBitrate).tqarg(m_config->getPrefAudioBitrate()).tqarg(m_config->getPrefAudioFormat().lower());
+ *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").arg(m_videoBitrate).arg(m_config->getPrefAudioBitrate()).arg(m_config->getPrefAudioFormat().lower());
*process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName();
qDebug(process->debug());
/*
@@ -376,15 +376,15 @@ void k9NewDVD::appendTitle(k9Title *_title) {
btn->setLeft(left*(m_config->getPrefButtonWidth()+50) +50);
btn->setWidth(m_config->getPrefButtonWidth());
btn->setHeight(m_config->getPrefButtonHeight());
- btn->setScript(TQString("g1=0;jump titleset %1 menu;").tqarg(_title->getNum()+1));
+ btn->setScript(TQString("g1=0;jump titleset %1 menu;").arg(_title->getNum()+1));
btn->setTextPosition(k9MenuButton::RIGHT);
- btn->setText(i18n("title %1").tqarg(_title->getNum()+1));
+ btn->setText(i18n("title %1").arg(_title->getNum()+1));
btn->setColor(m_config->getPrefButtonTextColor());
btn->setFont(m_config->getPrefButtonFont());
TQString script="\n";
for (k9Title *t = m_titles.first();t;t=m_titles.next()) {
- script +=TQString("if (g6== %1) { g6=0; jump titleset %2 menu;}\n").tqarg(t->getNum()+1).tqarg(t->getNum()+1);
+ script +=TQString("if (g6== %1) { g6=0; jump titleset %2 menu;}\n").arg(t->getNum()+1).arg(t->getNum()+1);
}
m_rootMenu->setStartScript2(script);
emit sigAddTitle();
diff --git a/k9author/k9newtitle.cpp b/k9author/k9newtitle.cpp
index a3db200..1882e9c 100644
--- a/k9author/k9newtitle.cpp
+++ b/k9author/k9newtitle.cpp
@@ -60,7 +60,7 @@ void k9NewTitle::bAddClicked() {
k9LvItemImport * item=new k9LvItemImport(m_k9Import->getRoot(),k9LvItemImport::TITLE);
item->setOpen(true);
k9Title *title=new k9Title( m_k9Import->getNewDVD());
- item->setText(0,i18n("title %1").tqarg(title->getNum() +1));
+ item->setText(0,i18n("title %1").arg(title->getNum() +1));
connect( title->getButton(),TQT_SIGNAL(sigsetImage(k9MenuButton*, const TQImage&)),m_k9Import,TQT_SLOT(buttonUpdated(k9MenuButton*, const TQImage&)));
item->setTitle(title);
@@ -114,7 +114,7 @@ void k9NewTitle::bAddClicked() {
pos+=increment;
file->setEnd(t.addMSecs(TQMIN(pos,fileInfo.getDuration()) *1000));
k9LvItemImport * itemch=new k9LvItemImport(item,k9LvItemImport::CHAPTER);
- itemch->setText(0,i18n("chapter %1").tqarg(i+1));
+ itemch->setText(0,i18n("chapter %1").arg(i+1));
itemch->setText(1,file->getStart().toString("hh:mm:ss") +" - "+file->getEnd().toString("hh:mm:ss") );
itemch->setAviFile(file);
itemch->setTitle(title);
@@ -134,9 +134,9 @@ void k9NewTitle::bAddClicked() {
btn->setLeft(left);
btn->setWidth(width);
btn->setHeight(height);
- btn->setScript(TQString("jump title 1 chapter %1 ;").tqarg(i+1));
+ btn->setScript(TQString("jump title 1 chapter %1 ;").arg(i+1));
btn->setTextPosition(k9MenuButton::BOTTOM);
- btn->setText(i18n("chapter %1").tqarg(i+1));
+ btn->setText(i18n("chapter %1").arg(i+1));
btn->setColor(config.getPrefButtonTextColor());
btn->setFont(config.getPrefButtonFont());
connect(file,TQT_SIGNAL(imageChanged(const TQImage&)),btn,TQT_SLOT(setImage(const TQImage&)));
diff --git a/k9author/menuEdit.cpp b/k9author/menuEdit.cpp
index 3f65a27..e7798c1 100644
--- a/k9author/menuEdit.cpp
+++ b/k9author/menuEdit.cpp
@@ -17,7 +17,7 @@
#include <tqcombobox.h>
#include <tqlineedit.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "kurlrequester.h"
@@ -37,12 +37,12 @@ menuEdit::menuEdit( TQWidget* parent, const char* name, WFlags fl )
menuEditLayout = new TQGridLayout( this, 1, 1, 2, 6, "menuEditLayout");
textLabel2 = new TQLabel( this, "textLabel2" );
- textLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) );
+ textLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addMultiCellWidget( textLabel2, 5, 6, 0, 0 );
textLabel1 = new TQLabel( this, "textLabel1" );
- textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addWidget( textLabel1, 4, 0 );
@@ -51,17 +51,17 @@ menuEdit::menuEdit( TQWidget* parent, const char* name, WFlags fl )
menuEditLayout->addMultiCellWidget( urBackground, 4, 4, 1, 5 );
cbColor = new KColorButton( this, "cbColor" );
- cbColor->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbColor->sizePolicy().hasHeightForWidth() ) );
+ cbColor->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbColor->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addWidget( cbColor, 6, 1 );
bFont = new KPushButton( this, "bFont" );
- bFont->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bFont->sizePolicy().hasHeightForWidth() ) );
+ bFont->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bFont->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addWidget( bFont, 6, 2 );
cbPosTitle = new TQComboBox( FALSE, this, "cbPosTitle" );
- cbPosTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbPosTitle->sizePolicy().hasHeightForWidth() ) );
+ cbPosTitle->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbPosTitle->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addWidget( cbPosTitle, 6, 3 );
spacer1 = new TQSpacerItem( 51, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -72,14 +72,14 @@ menuEdit::menuEdit( TQWidget* parent, const char* name, WFlags fl )
menuEditLayout->addMultiCellWidget( leTitle, 5, 5, 1, 4 );
bAddText = new KPushButton( this, "bAddText" );
- bAddText->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)4, 0, 0, bAddText->sizePolicy().hasHeightForWidth() ) );
+ bAddText->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)4, 0, 0, bAddText->sizePolicy().hasHeightForWidth() ) );
bAddText->setMinimumSize( TQSize( 24, 24 ) );
bAddText->setMaximumSize( TQSize( 24, 24 ) );
menuEditLayout->addWidget( bAddText, 5, 5 );
lTitle = new TQLabel( this, "lTitle" );
- lTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lTitle->sizePolicy().hasHeightForWidth() ) );
+ lTitle->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lTitle->sizePolicy().hasHeightForWidth() ) );
TQFont lTitle_font( lTitle->font() );
lTitle_font.setBold( TRUE );
lTitle->setFont( lTitle_font );
@@ -103,13 +103,13 @@ menuEdit::menuEdit( TQWidget* parent, const char* name, WFlags fl )
menuEditLayout->addMultiCellWidget( cbEnd, 3, 3, 1, 5 );
frame = new TQFrame( this, "frame" );
- frame->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, frame->sizePolicy().hasHeightForWidth() ) );
+ frame->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, frame->sizePolicy().hasHeightForWidth() ) );
frame->setFrameShape( TQFrame::StyledPanel );
frame->setFrameShadow( TQFrame::Raised );
menuEditLayout->addMultiCellWidget( frame, 1, 1, 0, 5 );
languageChange();
- resize( TQSize(576, 682).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(576, 682).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/k9author/menuEdit.ui b/k9author/menuEdit.ui
index 14abb77..7f34593 100644
--- a/k9author/menuEdit.ui
+++ b/k9author/menuEdit.ui
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -148,13 +148,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
diff --git a/k9author/newTitle.cpp b/k9author/newTitle.cpp
index 154e5ef..1f9f72c 100644
--- a/k9author/newTitle.cpp
+++ b/k9author/newTitle.cpp
@@ -18,7 +18,7 @@
#include <kpushbutton.h>
#include <tqlabel.h>
#include <kurlrequester.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "knuminput.h"
@@ -39,15 +39,15 @@ newTitle::newTitle( TQWidget* parent, const char* name, WFlags fl )
newTitleLayout = new TQGridLayout( this, 1, 1, 11, 6, "newTitleLayout");
buttonGroup1 = new TQButtonGroup( this, "buttonGroup1" );
- buttonGroup1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) );
+ buttonGroup1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
- buttonGroup1->tqlayout()->setSpacing( 6 );
- buttonGroup1->tqlayout()->setMargin( 11 );
- buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() );
- buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
+ buttonGroup1->layout()->setSpacing( 6 );
+ buttonGroup1->layout()->setMargin( 11 );
+ buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() );
+ buttonGroup1Layout->setAlignment( TQt::AlignTop );
nbChapters = new KIntNumInput( buttonGroup1, "nbChapters" );
- nbChapters->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, nbChapters->sizePolicy().hasHeightForWidth() ) );
+ nbChapters->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, nbChapters->sizePolicy().hasHeightForWidth() ) );
nbChapters->setMinValue( 1 );
nbChapters->setMaxValue( 99 );
@@ -55,7 +55,7 @@ newTitle::newTitle( TQWidget* parent, const char* name, WFlags fl )
twLength = new KTimeWidget( buttonGroup1, "twLength" );
twLength->setEnabled( FALSE );
- twLength->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, twLength->sizePolicy().hasHeightForWidth() ) );
+ twLength->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, twLength->sizePolicy().hasHeightForWidth() ) );
buttonGroup1Layout->addWidget( twLength, 1, 1 );
@@ -78,30 +78,30 @@ newTitle::newTitle( TQWidget* parent, const char* name, WFlags fl )
bAdd = new KPushButton( this, "bAdd" );
bAdd->setEnabled( FALSE );
- bAdd->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) );
+ bAdd->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) );
bAdd->setProperty( "stdItem", 27 );
newTitleLayout->addWidget( bAdd, 2, 1 );
spacer2 = new TQSpacerItem( 470, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
newTitleLayout->addItem( spacer2, 2, 0 );
- tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1");
+ layout1 = new TQHBoxLayout( 0, 0, 6, "layout1");
textLabel1 = new TQLabel( this, "textLabel1" );
- textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
- tqlayout1->addWidget( textLabel1 );
+ textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ layout1->addWidget( textLabel1 );
urFile = new KURLRequester( this, "urFile" );
urFile->setMode( 25 );
- tqlayout1->addWidget( urFile );
+ layout1->addWidget( urFile );
lTotalTime = new TQLabel( this, "lTotalTime" );
- lTotalTime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotalTime->sizePolicy().hasHeightForWidth() ) );
- tqlayout1->addWidget( lTotalTime );
+ lTotalTime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotalTime->sizePolicy().hasHeightForWidth() ) );
+ layout1->addWidget( lTotalTime );
- newTitleLayout->addMultiCellLayout( tqlayout1, 0, 0, 0, 1 );
+ newTitleLayout->addMultiCellLayout( layout1, 0, 0, 0, 1 );
languageChange();
- resize( TQSize(605, 171).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(605, 171).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/k9author/newTitle.ui b/k9author/newTitle.ui
index 7115c31..78b1250 100644
--- a/k9author/newTitle.ui
+++ b/k9author/newTitle.ui
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>16</height>
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -180,7 +180,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>470</width>
<height>20</height>
@@ -189,7 +189,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">