summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--k9Mplayer/k9mplayer.cpp6
-rw-r--r--k9author/k9chapteredit.cpp2
-rw-r--r--k9author/k9import.cpp6
-rw-r--r--k9author/k9importfiles.cpp2
-rw-r--r--k9author/k9menuedit.cpp16
-rw-r--r--k9author/k9newdvd.cpp10
-rw-r--r--k9author/k9newtitle.cpp8
-rw-r--r--libk9copy/k9backupdlg.cpp4
-rw-r--r--libk9copy/k9burndvd.cpp16
-rw-r--r--libk9copy/k9dvd.cpp8
-rw-r--r--libk9copy/k9dvdauthor.cpp10
-rw-r--r--libk9copy/k9mp4enc.cpp10
-rw-r--r--libk9copy/k9process.cpp2
-rw-r--r--libk9copy/k9processlist.cpp4
-rw-r--r--libk9copy/k9saveimage.cpp2
-rw-r--r--libk9copy/k9titleencopt.cpp2
-rw-r--r--src/k9copy.cpp66
-rw-r--r--src/k9main.cpp16
-rw-r--r--src/k9settings.cpp4
-rw-r--r--src/kviewmpeg2.cpp10
20 files changed, 102 insertions, 102 deletions
diff --git a/k9Mplayer/k9mplayer.cpp b/k9Mplayer/k9mplayer.cpp
index 3b30cf6..6f26c21 100644
--- a/k9Mplayer/k9mplayer.cpp
+++ b/k9Mplayer/k9mplayer.cpp
@@ -31,10 +31,10 @@ K9Mplayer::K9Mplayer(TQObject *parent,const char *name,const TQStringList args)
bPlay->setPixmap(SmallIcon("media-playback-start"));
bStop->setPixmap(SmallIcon("media-playback-stop"));
bSwitchAudio->setPixmap(SmallIcon("cycle"));
- connect(m_process,TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),this,TQT_SLOT(receivedStdout( TDEProcess*, char*, int )));
+ connect(m_process,TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )),this,TQ_SLOT(receivedStdout( TDEProcess*, char*, int )));
m_timer=new TQTimer(this);
- connect(m_process,TQT_SIGNAL(wroteStdin( TDEProcess* )),this,TQT_SLOT(wroteStdin( TDEProcess* )));
- connect(m_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(timeout()));
+ connect(m_process,TQ_SIGNAL(wroteStdin( TDEProcess* )),this,TQ_SLOT(wroteStdin( TDEProcess* )));
+ connect(m_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(timeout()));
m_container=new TQWidget(Label);
}
diff --git a/k9author/k9chapteredit.cpp b/k9author/k9chapteredit.cpp
index 3453cf5..ab545f4 100644
--- a/k9author/k9chapteredit.cpp
+++ b/k9author/k9chapteredit.cpp
@@ -31,7 +31,7 @@ k9ChapterEdit::k9ChapterEdit(TQWidget* parent, const char* name, WFlags fl)
TQGridLayout *l=new TQGridLayout(image,1,1);
l->addWidget(m_wimage,0,0);
m_wimage->setPaletteBackgroundColor(TQt::black);
- connect(&m_aviDecode,TQT_SIGNAL(drawFrame(TQImage*)),this,TQT_SLOT(drawImage(TQImage*)));
+ connect(&m_aviDecode,TQ_SIGNAL(drawFrame(TQImage*)),this,TQ_SLOT(drawImage(TQImage*)));
bTitleButton->setIconSet (SmallIcon("frame_image"));
}
diff --git a/k9author/k9import.cpp b/k9author/k9import.cpp
index e2a6620..e0443d4 100644
--- a/k9author/k9import.cpp
+++ b/k9author/k9import.cpp
@@ -31,7 +31,7 @@ k9Import::k9Import(TQWidget* parent, const char* name,k9CdDrives *_drives)
m_parent=(k9Copy*) parent;
drives=_drives;
- connect(&m_newDVD,TQT_SIGNAL(sigAddTitle()),this,TQT_SLOT(titleAdded()));
+ connect(&m_newDVD,TQ_SIGNAL(sigAddTitle()),this,TQ_SLOT(titleAdded()));
}
k9Import::~k9Import() {}
@@ -46,8 +46,8 @@ void k9Import::init() {
m_root->setPixmap(0,SmallIcon("media-optical-dvd-unmounted"));
emit aviFileSelected(NULL);
- connect(drives,TQT_SIGNAL(deviceAdded( k9CdDrive*)),this,TQT_SLOT(deviceAdded( k9CdDrive* )));
- connect(drives,TQT_SIGNAL(deviceRemoved( k9CdDrive*)),this,TQT_SLOT(deviceRemoved( k9CdDrive* )));
+ connect(drives,TQ_SIGNAL(deviceAdded( k9CdDrive*)),this,TQ_SLOT(deviceAdded( k9CdDrive* )));
+ connect(drives,TQ_SIGNAL(deviceRemoved( k9CdDrive*)),this,TQ_SLOT(deviceRemoved( k9CdDrive* )));
readDrives();
m_root->setSelected(true);
diff --git a/k9author/k9importfiles.cpp b/k9author/k9importfiles.cpp
index e53fa86..8674eb0 100644
--- a/k9author/k9importfiles.cpp
+++ b/k9author/k9importfiles.cpp
@@ -33,7 +33,7 @@ k9ImportFiles::k9ImportFiles(TQWidget *parent, const char *name)
k9ChapterEdit *ch=new k9ChapterEdit(this);
addToolWindow(ch, KDockWidget::DockBottom, getMainDockWidget(),0,i18n("Chapter properties"),i18n("Chapter properties"));
- connect(m_k9Import,TQT_SIGNAL(aviFileSelected(k9AviFile*)),ch,TQT_SLOT(setAviFile(k9AviFile*)));
+ connect(m_k9Import,TQ_SIGNAL(aviFileSelected(k9AviFile*)),ch,TQ_SLOT(setAviFile(k9AviFile*)));
m_k9NewTitle=new k9NewTitle(this);
m_k9NewTitle->setK9Import(m_k9Import);
diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp
index 54a9a7a..f64bc93 100644
--- a/k9author/k9menuedit.cpp
+++ b/k9author/k9menuedit.cpp
@@ -43,7 +43,7 @@ k9MenuEdit::k9MenuEdit(TQWidget* parent, const char* name,TQCanvas *_canvas)
m_canvas->resize(720,m_imageHeight);
m_text=NULL;
m_menuEditor->setMenu(this);
- connect(m_menuEditor,TQT_SIGNAL(itemSelected()),this,TQT_SLOT(itemSelected()));
+ connect(m_menuEditor,TQ_SIGNAL(itemSelected()),this,TQ_SLOT(itemSelected()));
cbPosTitle->setEnabled(false);
}
void k9MenuEdit::updateTextPos(const TQPoint &_point) {
@@ -238,8 +238,8 @@ void k9MenuEdit::setCanvas(TQCanvas* _value) {
}
void k9MenuEdit::titleSelected(k9Title *_title) {
- disconnect (this,TQT_SIGNAL(startScriptChanged(const TQString&)),0,0);
- disconnect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),0,0);
+ disconnect (this,TQ_SIGNAL(startScriptChanged(const TQString&)),0,0);
+ disconnect (this,TQ_SIGNAL(endScriptChanged(const TQString&)),0,0);
cbEnd->setEnabled(true);
m_menuEditor->clearSelection();
lTitle->setText(i18n("Title %1 Menu").arg(_title->getNum()+1));
@@ -257,7 +257,7 @@ void k9MenuEdit::titleSelected(k9Title *_title) {
m_startScripts << "if (g1==0) {g1=1; jump title 1 chapter 1;}";
if (_title->getMenu()->getStartScript() !="")
cbStart->setCurrentItem(cbStart->count()-1);
- connect (this,TQT_SIGNAL(startScriptChanged(const TQString&)),_title->getMenu(),TQT_SLOT(setStartScript(const TQString&)));
+ connect (this,TQ_SIGNAL(startScriptChanged(const TQString&)),_title->getMenu(),TQ_SLOT(setStartScript(const TQString&)));
cbEnd->insertItem(i18n("Play Root Menu"));
m_endScripts << "g6=0; call vmgm menu;";
@@ -274,13 +274,13 @@ void k9MenuEdit::titleSelected(k9Title *_title) {
if (_title->getMenu()->getEndScript()== *(m_endScripts.at(i)))
cbEnd->setCurrentItem(i);
}
- connect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),_title->getMenu(),TQT_SLOT(setEndScript(const TQString&)));
+ connect (this,TQ_SIGNAL(endScriptChanged(const TQString&)),_title->getMenu(),TQ_SLOT(setEndScript(const TQString&)));
}
void k9MenuEdit::rootSelected(k9NewDVD *_newDVD) {
- disconnect (this,TQT_SIGNAL(startScriptChanged(const TQString&)),0,0);
- disconnect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),0,0);
+ disconnect (this,TQ_SIGNAL(startScriptChanged(const TQString&)),0,0);
+ disconnect (this,TQ_SIGNAL(endScriptChanged(const TQString&)),0,0);
cbEnd->setEnabled(false);
m_menuEditor->clearSelection();
lTitle->setText(i18n("Root Menu"));
@@ -299,7 +299,7 @@ void k9MenuEdit::rootSelected(k9NewDVD *_newDVD) {
if (script==_newDVD->getRootMenu()->getStartScript())
cbStart->setCurrentItem(cbStart->count()-1);
}
- connect (this,TQT_SIGNAL(startScriptChanged(const TQString&)),_newDVD->getRootMenu(),TQT_SLOT(setStartScript(const TQString&)));
+ connect (this,TQ_SIGNAL(startScriptChanged(const TQString&)),_newDVD->getRootMenu(),TQ_SLOT(setStartScript(const TQString&)));
}
void k9MenuEdit::bAddTextClick() {
diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp
index c997340..ba6b352 100644
--- a/k9author/k9newdvd.cpp
+++ b/k9author/k9newdvd.cpp
@@ -51,12 +51,12 @@ void k9NewDVD::execute() {
m_cancel=false;
m_error="";
m_config=new k9Config();
- // connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getStderr(TDEProcess *, char *, int) ));
+ // connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getStderr(TDEProcess *, char *, int) ));
- connect(&m_aviDecode,TQT_SIGNAL(drawFrame(TQImage*)),this,TQT_SLOT(drawImage(TQImage*)));
+ connect(&m_aviDecode,TQ_SIGNAL(drawFrame(TQImage*)),this,TQ_SLOT(drawImage(TQImage*)));
k9Tools::clearOutput(m_workDir+"dvd");
createXML();
- disconnect(&m_aviDecode,TQT_SIGNAL(drawFrame(TQImage*)),this,TQT_SLOT(drawImage(TQImage*)));
+ disconnect(&m_aviDecode,TQ_SIGNAL(drawFrame(TQImage*)),this,TQ_SLOT(drawImage(TQImage*)));
delete m_config;
}
@@ -120,7 +120,7 @@ void k9NewDVD::createXML() {
m_processList->clear();
k9Process *process=m_processList->addProcess(i18n("authoring"));
- connect(process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getStderr(TDEProcess *, char *, int) ));
+ connect(process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getStderr(TDEProcess *, char *, int) ));
*process << "dvdauthor" << "-x" << dvdAuthor;
m_processList->execute();
m_cancel=m_processList->getCancel();
@@ -250,7 +250,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *
TQTime t(0,0);
t.start();
m_timers[process]=t;
- connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getStdout(TDEProcess *, char *, int) ));
+ connect(process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(getStdout(TDEProcess *, char *, int) ));
//m_progress->setTitle(i18n("Encoding file"));
//m_process->clearArguments();
*process << "mencoder" << "-oac" << "lavc" << "-ovc" << "lavc" << "-of" << "mpeg" <<"-afm" <<"libmad";
diff --git a/k9author/k9newtitle.cpp b/k9author/k9newtitle.cpp
index 4b8744c..21ae085 100644
--- a/k9author/k9newtitle.cpp
+++ b/k9author/k9newtitle.cpp
@@ -62,11 +62,11 @@ void k9NewTitle::bAddClicked() {
k9Title *title=new k9Title( m_k9Import->getNewDVD());
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&)));
+ connect( title->getButton(),TQ_SIGNAL(sigsetImage(k9MenuButton*, const TQImage&)),m_k9Import,TQ_SLOT(buttonUpdated(k9MenuButton*, const TQImage&)));
item->setTitle(title);
- connect(&fileInfo,TQT_SIGNAL(drawFrame(TQImage*)),this,TQT_SLOT(drawImage(TQImage*)));
+ connect(&fileInfo,TQ_SIGNAL(drawFrame(TQImage*)),this,TQ_SLOT(drawImage(TQImage*)));
@@ -119,7 +119,7 @@ void k9NewTitle::bAddClicked() {
itemch->setAviFile(file);
itemch->setTitle(title);
itemch->setPixmap(0,TQPixmap(m_image.smoothScale(50,40)));
- connect(file,TQT_SIGNAL(aviFileUpdated(k9AviFile*)),m_k9Import,TQT_SLOT(aviFileUpdated(k9AviFile*)));
+ connect(file,TQ_SIGNAL(aviFileUpdated(k9AviFile*)),m_k9Import,TQ_SLOT(aviFileUpdated(k9AviFile*)));
k9MenuButton *btn=title->getMenu()->addButton();
btn->setNum(i+1);
@@ -139,7 +139,7 @@ void k9NewTitle::bAddClicked() {
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&)));
+ connect(file,TQ_SIGNAL(imageChanged(const TQImage&)),btn,TQ_SLOT(setImage(const TQImage&)));
}
title->getMenu()->setEndScript("call vmgm menu;");
diff --git a/libk9copy/k9backupdlg.cpp b/libk9copy/k9backupdlg.cpp
index 113a0d7..3b392d9 100644
--- a/libk9copy/k9backupdlg.cpp
+++ b/libk9copy/k9backupdlg.cpp
@@ -40,7 +40,7 @@ k9BackupDlg::k9BackupDlg(TQWidget* parent, const char* name, bool modal, WFlags
timer = new TQTimer( this );
time = new TQTime(0,0);
time->start();
- connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) );
+ connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) );
timer->start(500, 0 );
bAbort->setIconSet(KStdGuiItem::cancel().iconSet());
bPlay->setIconSet(SmallIcon("media-playback-start"));
@@ -50,7 +50,7 @@ k9BackupDlg::k9BackupDlg(TQWidget* parent, const char* name, bool modal, WFlags
m_totalSteps=0;
m_factor="";
m_progress=0;
- connect(&m_decoder, TQT_SIGNAL(pixmapReady(TQImage *)), this, TQT_SLOT(drawPixmap(TQImage *)));
+ connect(&m_decoder, TQ_SIGNAL(pixmapReady(TQImage *)), this, TQ_SLOT(drawPixmap(TQImage *)));
m_stop=false;
m_playmovie=true;
m_cpt=0;
diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp
index 8269344..b97332a 100644
--- a/libk9copy/k9burndvd.cpp
+++ b/libk9copy/k9burndvd.cpp
@@ -125,8 +125,8 @@ const TQString k9BurnDVD::getImageSize() {
*proc2 <<"-V "+volId;
*proc2 << TQDir::cleanDirPath(workDir +"/dvd");
- connect( proc2, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )),this, TQT_SLOT(mkisoSizeStderr(TDEProcess *, char *, int)) );
- connect( proc2, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(mkisoSizeStdout(TDEProcess *, char *, int)) );
+ connect( proc2, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int )),this, TQ_SLOT(mkisoSizeStderr(TDEProcess *, char *, int)) );
+ connect( proc2, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(mkisoSizeStdout(TDEProcess *, char *, int)) );
if (proc2->start(TDEProcess::NotifyOnExit,TDEProcess::All)) {
// while (proc2->isRunning()) {
// tqApp->processEvents();
@@ -158,12 +158,12 @@ void k9BurnDVD::getGenisoimageCmd(k9Process *proc,TQString _fileName,bool _print
*proc <<"-o";
*proc <<_fileName;
}
- connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(growisoStderr(TDEProcess *, char *, int)) );
- connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(growisoStdout(TDEProcess *, char *, int)) );
+ connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(growisoStderr(TDEProcess *, char *, int)) );
+ connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(growisoStdout(TDEProcess *, char *, int)) );
} else {
*proc << "-print-size" << "-quiet";
- connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )),this, TQT_SLOT(mkisoSizeStderr(TDEProcess *, char *, int)) );
- connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(mkisoSizeStdout(TDEProcess *, char *, int)) );
+ connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int )),this, TQ_SLOT(mkisoSizeStderr(TDEProcess *, char *, int)) );
+ connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(mkisoSizeStdout(TDEProcess *, char *, int)) );
}
*proc <<TQDir::cleanDirPath(workDir +"/dvd");
@@ -296,8 +296,8 @@ void k9BurnDVD::burnWithGrowisofs() {
*proc <<"-V "+volId;
*proc <<TQDir::cleanDirPath(workDir +"/dvd");
- connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(growisoStderr(TDEProcess *, char *, int)) );
- connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(growisoStdout(TDEProcess *, char *, int)) );
+ connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(growisoStderr(TDEProcess *, char *, int)) );
+ connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(growisoStdout(TDEProcess *, char *, int)) );
if (!autoBurn && !iso) {
c=i18n("Insert a recordable DVD");
if ( KMessageBox::warningContinueCancel ( 0,c, i18n("DVD burning"))!=KMessageBox::Continue)
diff --git a/libk9copy/k9dvd.cpp b/libk9copy/k9dvd.cpp
index 6b38063..c3d0684 100644
--- a/libk9copy/k9dvd.cpp
+++ b/libk9copy/k9dvd.cpp
@@ -312,10 +312,10 @@ int k9DVD::scandvd (const TQString & device,bool _quickScan) {
m_progressDlg->setpbTitleStep(0);
m_progressDlg->setpbTotalStep(0);
- connect(this, TQT_SIGNAL(sigVobProgress(unsigned int,unsigned int)), this, TQT_SLOT(slotVobProgress(unsigned int,unsigned int)));
- connect(this, TQT_SIGNAL(sigTitleProgress(unsigned int,unsigned int)), this, TQT_SLOT(slotTitleProgress(unsigned int,unsigned int)));
- connect(this, TQT_SIGNAL(sigTitleText(TQString&)), this, TQT_SLOT(slotTitleText(TQString&)));
- connect(this, TQT_SIGNAL(sigTotalText(TQString&)), this, TQT_SLOT(slotTotalText(TQString&)));
+ connect(this, TQ_SIGNAL(sigVobProgress(unsigned int,unsigned int)), this, TQ_SLOT(slotVobProgress(unsigned int,unsigned int)));
+ connect(this, TQ_SIGNAL(sigTitleProgress(unsigned int,unsigned int)), this, TQ_SLOT(slotTitleProgress(unsigned int,unsigned int)));
+ connect(this, TQ_SIGNAL(sigTitleText(TQString&)), this, TQ_SLOT(slotTitleText(TQString&)));
+ connect(this, TQ_SIGNAL(sigTotalText(TQString&)), this, TQ_SLOT(slotTotalText(TQString&)));
m_progressDlg->show();
} else
m_progressDlg=NULL;
diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp
index b45e1a0..695cd0e 100644
--- a/libk9copy/k9dvdauthor.cpp
+++ b/libk9copy/k9dvdauthor.cpp
@@ -444,11 +444,11 @@ void k9DVDAuthor::author() {
TQString c("dvdauthor");
proc=progress->getProcess();// new TQProcess(c,0);
*proc << c << "-x" << m_xml->name(); //locateLocal("tmp", "k9copy/k9author.xml");
- connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
- this, TQT_SLOT(DVDAuthorStderr(TDEProcess *, char *, int )) );
- connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
- this, TQT_SLOT(DVDAuthorStdout(TDEProcess *, char *, int)) );
- // connect(progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(stopProcess()));
+ connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ this, TQ_SLOT(DVDAuthorStderr(TDEProcess *, char *, int )) );
+ connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this, TQ_SLOT(DVDAuthorStdout(TDEProcess *, char *, int)) );
+ // connect(progress, TQ_SIGNAL(cancelled()), this, TQ_SLOT(stopProcess()));
m_copied=0;
m_lastPos=0;
diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp
index 0c3480c..93f2ace 100644
--- a/libk9copy/k9mp4enc.cpp
+++ b/libk9copy/k9mp4enc.cpp
@@ -46,7 +46,7 @@ k9MP4Enc::k9MP4Enc ( TQObject *parent, const char *name,const TQStringList& )
m_lstVideo=config.getCodecVideo();
timer = new TQTimer ( this );
- connect ( timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( timerDone() ) );
+ connect ( timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( timerDone() ) );
m_progress=new k9MP4Dlg ( tqApp->mainWidget(),0 );
}
@@ -395,10 +395,10 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
tqDebug ( "%s", s.ascii() );
time->start();
m_timer3.start();
- connect ( m_process, TQT_SIGNAL ( receivedStdout ( TDEProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( TDEProcess *, char *, int ) ) );
- connect ( m_process, TQT_SIGNAL ( receivedStderr ( TDEProcess *, char *, int ) ),this, TQT_SLOT ( getStderr ( TDEProcess *, char *, int ) ) );
- //connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(exited(TDEProcess*)));
- connect ( m_progress,TQT_SIGNAL ( sigCancel() ),this,TQT_SLOT ( slotCancel() ) );
+ connect ( m_process, TQ_SIGNAL ( receivedStdout ( TDEProcess *, char *, int ) ),this, TQ_SLOT ( getStdout ( TDEProcess *, char *, int ) ) );
+ connect ( m_process, TQ_SIGNAL ( receivedStderr ( TDEProcess *, char *, int ) ),this, TQ_SLOT ( getStderr ( TDEProcess *, char *, int ) ) );
+ //connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(exited(TDEProcess*)));
+ connect ( m_progress,TQ_SIGNAL ( sigCancel() ),this,TQ_SLOT ( slotCancel() ) );
m_canceled=false;
m_progress->show();
m_process->start ( TDEProcess::OwnGroup, TDEProcess::All );
diff --git a/libk9copy/k9process.cpp b/libk9copy/k9process.cpp
index 552fed7..1d90637 100644
--- a/libk9copy/k9process.cpp
+++ b/libk9copy/k9process.cpp
@@ -17,7 +17,7 @@
k9Process::k9Process(TQObject *parent, const char *name)
: TDEProcess(parent, name),m_waitSync(false)
{
- connect(this,TQT_SIGNAL(processExited( TDEProcess* )),this,TQT_SLOT(slotProcessExited( TDEProcess* )));
+ connect(this,TQ_SIGNAL(processExited( TDEProcess* )),this,TQ_SLOT(slotProcessExited( TDEProcess* )));
}
diff --git a/libk9copy/k9processlist.cpp b/libk9copy/k9processlist.cpp
index 4f788a4..3b3087c 100644
--- a/libk9copy/k9processlist.cpp
+++ b/libk9copy/k9processlist.cpp
@@ -50,7 +50,7 @@ k9ProcessList::k9ProcessList(TQWidget* parent, const char* name, WFlags fl) : pr
{
m_processes.setAutoDelete(true);
m_maxProcess=4;
- connect(&m_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(timeout()));
+ connect(&m_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(timeout()));
bCancel->setEnabled(false);
}
@@ -153,7 +153,7 @@ k9Process *k9ProcessList::addProcess(const TQString &label) {
TQListViewItem *item = new _k9ProcessListItem(lProcess,label);
m_items[process]=item;
setProgress(process,0,100);
- connect(process,TQT_SIGNAL(processExited( TDEProcess* )),this,TQT_SLOT(processExited(TDEProcess*)));
+ connect(process,TQ_SIGNAL(processExited( TDEProcess* )),this,TQ_SLOT(processExited(TDEProcess*)));
return process;
}
diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp
index 1a2671e..fbc8f9d 100644
--- a/libk9copy/k9saveimage.cpp
+++ b/libk9copy/k9saveimage.cpp
@@ -31,7 +31,7 @@ k9SaveImage::k9SaveImage()
m_tempFile= new KTempFile(locateLocal("tmp", "k9copy/k9p"), "");
m_tempFile->setAutoDelete(true);
m_decoder=new kDecMPEG2();
- connect(m_decoder, TQT_SIGNAL(pixmapReady(TQImage *)), this, TQT_SLOT(drawImage(TQImage *)));
+ connect(m_decoder, TQ_SIGNAL(pixmapReady(TQImage *)), this, TQ_SLOT(drawImage(TQImage *)));
}
diff --git a/libk9copy/k9titleencopt.cpp b/libk9copy/k9titleencopt.cpp
index 451eea2..d3257ec 100644
--- a/libk9copy/k9titleencopt.cpp
+++ b/libk9copy/k9titleencopt.cpp
@@ -17,7 +17,7 @@
k9TitleEncOpt::k9TitleEncOpt(k9DVDTitle *parent)
: TQObject(parent, "")
{
- connect (parent,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(load()));
+ connect (parent,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(load()));
load();
}
diff --git a/src/k9copy.cpp b/src/k9copy.cpp
index 7fe8849..273a90d 100644
--- a/src/k9copy.cpp
+++ b/src/k9copy.cpp
@@ -129,8 +129,8 @@ void k9Copy::createCopyWindows() {
m_previewAcc=addToolWindow(m_mp2,KDockWidget::DockRight,getMainDockWidget(),0,i18n("Preview"),i18n("Preview"));
m_ToolViews.append(m_previewAcc);
- connect(m_k9Main,TQT_SIGNAL(showPreview( k9DVD*, k9DVDTitle*,int )),m_mp2,TQT_SLOT(open( k9DVD*, k9DVDTitle*,int )));
- connect(m_k9Main,TQT_SIGNAL(stopPreview()),m_mp2,TQT_SLOT(bStopClick()));
+ connect(m_k9Main,TQ_SIGNAL(showPreview( k9DVD*, k9DVDTitle*,int )),m_mp2,TQ_SLOT(open( k9DVD*, k9DVDTitle*,int )));
+ connect(m_k9Main,TQ_SIGNAL(stopPreview()),m_mp2,TQ_SLOT(bStopClick()));
m_factors =new k9TitleFactor( this);
m_factors->setUseDvdAuthor(m_useDvdAuthor);
@@ -138,8 +138,8 @@ void k9Copy::createCopyWindows() {
acc=addToolWindow(m_factors,KDockWidget::DockBottom,getMainDockWidget(),10,i18n("Shrink Factor"),i18n("Shrink Factor"));
m_ToolViews.append(acc);
- connect(m_k9Main,TQT_SIGNAL(SelectionChanged( k9DVD*,bool )),m_factors,TQT_SLOT(SelectionChanged( k9DVD*,bool )));
- connect(m_k9Main,TQT_SIGNAL(changedTitle( k9DVDTitle* )),m_factors,TQT_SLOT(changedTitle( k9DVDTitle* )));
+ connect(m_k9Main,TQ_SIGNAL(SelectionChanged( k9DVD*,bool )),m_factors,TQ_SLOT(SelectionChanged( k9DVD*,bool )));
+ connect(m_k9Main,TQ_SIGNAL(changedTitle( k9DVDTitle* )),m_factors,TQ_SLOT(changedTitle( k9DVDTitle* )));
KDockWidget *dw=dockManager->findWidgetParentDock (m_factors);
dw->setForcedFixedHeight(h);
@@ -148,10 +148,10 @@ void k9Copy::createCopyWindows() {
// allow the view to change the statusbar and caption
- connect(m_k9Main, TQT_SIGNAL(changeStatusbar(const TQString&,int )),
- this, TQT_SLOT(changeStatusbar(const TQString&,int)));
- connect(m_k9Main, TQT_SIGNAL(changeCaption(const TQString&)),
- this, TQT_SLOT(changeCaption(const TQString&)));
+ connect(m_k9Main, TQ_SIGNAL(changeStatusbar(const TQString&,int )),
+ this, TQ_SLOT(changeStatusbar(const TQString&,int)));
+ connect(m_k9Main, TQ_SIGNAL(changeCaption(const TQString&)),
+ this, TQ_SLOT(changeCaption(const TQString&)));
setAutoSaveSettings();
KSimpleConfig settings("K9Copy");
@@ -195,8 +195,8 @@ void k9Copy::createImportWindows() {
acc=addToolWindow(m_menuEdit, KDockWidget::DockRight, getMainDockWidget(),20,i18n("Edit menu"),i18n("Edit Menu"));
m_ToolViews.append(acc);
- connect (m_k9Import,TQT_SIGNAL(titleSelected(k9Title*)),m_menuEdit,TQT_SLOT(titleSelected(k9Title*)));
- connect (m_k9Import,TQT_SIGNAL(rootSelected(k9NewDVD*)),m_menuEdit,TQT_SLOT(rootSelected(k9NewDVD*)));
+ connect (m_k9Import,TQ_SIGNAL(titleSelected(k9Title*)),m_menuEdit,TQ_SLOT(titleSelected(k9Title*)));
+ connect (m_k9Import,TQ_SIGNAL(rootSelected(k9NewDVD*)),m_menuEdit,TQ_SLOT(rootSelected(k9NewDVD*)));
m_k9Import->setMenuEdit(m_menuEdit);
m_newTitle=new k9NewTitle(this);
@@ -211,16 +211,16 @@ void k9Copy::createImportWindows() {
m_chapterEdit->setIcon(SmallIcon("title"));
acc=addToolWindow(m_chapterEdit, KDockWidget::DockBottom, getMainDockWidget(),20,i18n("Chapter properties"),i18n("Chapter properties"));
m_ToolViews.append(acc);
- connect(m_k9Import,TQT_SIGNAL(aviFileSelected(k9AviFile*)),m_chapterEdit,TQT_SLOT(setAviFile(k9AviFile*)));
+ connect(m_k9Import,TQ_SIGNAL(aviFileSelected(k9AviFile*)),m_chapterEdit,TQ_SLOT(setAviFile(k9AviFile*)));
// allow the view to change the statusbar and caption
/*
- connect(m_k9Main, TQT_SIGNAL(changeStatusbar(const TQString&,int )),
- this, TQT_SLOT(changeStatusbar(const TQString&,int)));
- connect(m_k9Main, TQT_SIGNAL(changeCaption(const TQString&)),
- this, TQT_SLOT(changeCaption(const TQString&)));
+ connect(m_k9Main, TQ_SIGNAL(changeStatusbar(const TQString&,int )),
+ this, TQ_SLOT(changeStatusbar(const TQString&,int)));
+ connect(m_k9Main, TQ_SIGNAL(changeCaption(const TQString&)),
+ this, TQ_SLOT(changeCaption(const TQString&)));
*/
setAutoSaveSettings();
KSimpleConfig settings("K9Copy");
@@ -251,18 +251,18 @@ bool k9Copy::queryClose ( ) {
void k9Copy::setupActions() {
- m_actions["open"]=KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
- m_actions["quit"]=KStdAction::quit(this, TQT_SLOT(quit()), actionCollection());
- m_actions["preferences"]=KStdAction::preferences(this,TQT_SLOT(preferences()),actionCollection());
- KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+ m_actions["open"]=KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+ m_actions["quit"]=KStdAction::quit(this, TQ_SLOT(quit()), actionCollection());
+ m_actions["preferences"]=KStdAction::preferences(this,TQ_SLOT(preferences()),actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
setStandardToolBarMenuEnabled(TRUE);
createStandardStatusBarAction();
PlayTitleAction = new TDEAction(i18n("Play title"), 0,
- this, TQT_SLOT(ActionPlayTitle()),
+ this, TQ_SLOT(ActionPlayTitle()),
actionCollection(), "PlayTitle");
m_actions["playtitle"]=PlayTitleAction;
@@ -271,28 +271,28 @@ void k9Copy::setupActions() {
PlayTitleAction->setIconSet(TQIconSet(img));
CopyAction = new TDEAction(i18n("Copy"), 0,
- this, TQT_SLOT(ActionCopy()),
+ this, TQ_SLOT(ActionCopy()),
actionCollection(), "Copy");
m_actions["copy"]=CopyAction;
CopyAction->setIcon("dvdcopy");
mkMpeg2Action = new TDEAction(i18n("Extract MPEG2"),0,
- this, TQT_SLOT(ActionMpeg2()),
+ this, TQ_SLOT(ActionMpeg2()),
actionCollection(),"MakeMPEG2");
m_actions["mp2"]=mkMpeg2Action;
mkMpeg2Action->setIcon("mpeg");
mkMP4Action = new TDEAction(i18n("Create MPEG-4"),0,
- this, TQT_SLOT(ActionMP4()),
+ this, TQ_SLOT(ActionMP4()),
actionCollection(),"MakeMPEG4");
m_actions["mp4"]=mkMP4Action;
mkMP4Action->setIcon("mp4");
ejectAction = new TDEAction(i18n("Eject"),0,
- this, TQT_SLOT(ActionEject()),
+ this, TQ_SLOT(ActionEject()),
actionCollection() , "Eject");
ejectAction->setIcon("player_eject");
@@ -300,19 +300,19 @@ void k9Copy::setupActions() {
backupAction= new TDERadioAction(i18n("DVD Backup"),0,
- this, TQT_SLOT(ActionBackup()),
+ this, TQ_SLOT(ActionBackup()),
actionCollection(), "backup");
backupAction->setExclusiveGroup("mode");
m_actions["backup"]=backupAction;
authorAction= new TDERadioAction(i18n("DVD Author"),0,
- this, TQT_SLOT(ActionAuthor()),
+ this, TQ_SLOT(ActionAuthor()),
actionCollection(), "author");
authorAction->setExclusiveGroup("mode");
m_actions["author"]=authorAction;
m_actions["create"]= new TDEAction(i18n("Create DVD"),0,
- this, TQT_SLOT(ActionCreate()),
+ this, TQ_SLOT(ActionCreate()),
actionCollection(), "Create");
m_actions["create"]->setIcon("author");
@@ -354,7 +354,7 @@ void k9Copy::optionsConfigureToolbars() {
// use the standard toolbar editor
saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
KEditToolbar dlg(factory());
- connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig()));
+ connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig()));
dlg.exec();
}
@@ -375,8 +375,8 @@ void k9Copy::fileOpen() {
void k9Copy::addMp4TitleOptions() {
m_mp4=new k9MP4Title(this);
m_ToolViews.append(addToolWindow(m_mp4,KDockWidget::DockBottom,getMainDockWidget(),10,i18n("MPEG4 Encoding options"),i18n("MPEG4 Encoding Options")));
- connect(m_k9Main,TQT_SIGNAL(changedTitle( k9DVDTitle* )),m_mp4,TQT_SLOT(titleChanged( k9DVDTitle* )));
- connect(m_k9Main,TQT_SIGNAL(SelectionChanged( k9DVD*,bool )),m_mp4,TQT_SLOT(selectionChanged( k9DVD*,bool )));
+ connect(m_k9Main,TQ_SIGNAL(changedTitle( k9DVDTitle* )),m_mp4,TQ_SLOT(titleChanged( k9DVDTitle* )));
+ connect(m_k9Main,TQ_SIGNAL(SelectionChanged( k9DVD*,bool )),m_mp4,TQ_SLOT(selectionChanged( k9DVD*,bool )));
}
@@ -399,8 +399,8 @@ void k9Copy::preferences() {
m_previewAcc=addToolWindow(m_mp2,KDockWidget::DockRight,getMainDockWidget(),0,i18n("Preview"),i18n("Preview"));
m_ToolViews.append(m_previewAcc);
//kViewMPEG2 * v=(kViewMPEG2*) m_mp2;
- connect(m_k9Main,TQT_SIGNAL(showPreview( k9DVD*, k9DVDTitle*,int )),m_mp2,TQT_SLOT(open( k9DVD*, k9DVDTitle*,int )));
- connect(m_k9Main,TQT_SIGNAL(stopPreview()),m_mp2,TQT_SLOT(bStopClick()));
+ connect(m_k9Main,TQ_SIGNAL(showPreview( k9DVD*, k9DVDTitle*,int )),m_mp2,TQ_SLOT(open( k9DVD*, k9DVDTitle*,int )));
+ connect(m_k9Main,TQ_SIGNAL(stopPreview()),m_mp2,TQ_SLOT(bStopClick()));
m_mp4->load();
}
diff --git a/src/k9main.cpp b/src/k9main.cpp
index 77dfc10..0167945 100644
--- a/src/k9main.cpp
+++ b/src/k9main.cpp
@@ -110,15 +110,15 @@ k9Main::k9Main(TQWidget* parent, const char* name, k9CdDrives *_drives)
listView1->setDefaultRenameAction(TQListView::Accept);
// TDEStandardDirs kd;
m_prefOutput=locateLocal("tmp","k9copy/",true); //kd.findResource("tmp","");
- connect(drives,TQT_SIGNAL(deviceAdded( k9CdDrive*)),this,TQT_SLOT(deviceAdded( k9CdDrive* )));
- connect(drives,TQT_SIGNAL(deviceRemoved( k9CdDrive*)),this,TQT_SLOT(deviceRemoved( k9CdDrive* )));
+ connect(drives,TQ_SIGNAL(deviceAdded( k9CdDrive*)),this,TQ_SLOT(deviceAdded( k9CdDrive* )));
+ connect(drives,TQ_SIGNAL(deviceRemoved( k9CdDrive*)),this,TQ_SLOT(deviceRemoved( k9CdDrive* )));
readSettings();
bInputOpen->setPixmap(SmallIcon("document-open"));
bInputOpenDir->setPixmap(SmallIcon("folder_open"));
emit SelectionChanged(NULL,true);
m_update=new k9UpdateFactor(this,"");
- connect(m_update,TQT_SIGNAL(updateFactor_internal()),this,TQT_SLOT(updateFactor_internal()));
+ connect(m_update,TQ_SIGNAL(updateFactor_internal()),this,TQ_SLOT(updateFactor_internal()));
}
@@ -532,9 +532,9 @@ void k9Main::Open()
k9DVDTitle * l_track;
TQString t;
TQTime h;
- connect(listView1,TQT_SIGNAL(itemRenamed(TQListViewItem*,int)),this,TQT_SLOT(itemRenamed(TQListViewItem *,int)));
- connect(listView1,TQT_SIGNAL(expanded( TQListViewItem*)),this,TQT_SLOT(expanded( TQListViewItem* )));
- connect(listView1,TQT_SIGNAL(collapsed( TQListViewItem*)),this,TQT_SLOT(collapsed( TQListViewItem* )));
+ connect(listView1,TQ_SIGNAL(itemRenamed(TQListViewItem*,int)),this,TQ_SLOT(itemRenamed(TQListViewItem *,int)));
+ connect(listView1,TQ_SIGNAL(expanded( TQListViewItem*)),this,TQ_SLOT(expanded( TQListViewItem* )));
+ connect(listView1,TQ_SIGNAL(collapsed( TQListViewItem*)),this,TQ_SLOT(collapsed( TQListViewItem* )));
closeDVD();
TQString sDevice=getDevice(cbInputDev);
@@ -1414,8 +1414,8 @@ long k9Main::getFreeSpace(const TQString & _path)
KDiskFreeSp *FreeSp=new KDiskFreeSp();
;
- connect(FreeSp,TQT_SIGNAL(foundMountPoint (const TQString &, unsigned long , unsigned long , unsigned long )),this,TQT_SLOT(foundMountPoint (const TQString &, unsigned long , unsigned long , unsigned long )));
- connect(FreeSp,TQT_SIGNAL(done ( )),this,TQT_SLOT(fspDone ()));
+ connect(FreeSp,TQ_SIGNAL(foundMountPoint (const TQString &, unsigned long , unsigned long , unsigned long )),this,TQ_SLOT(foundMountPoint (const TQString &, unsigned long , unsigned long , unsigned long )));
+ connect(FreeSp,TQ_SIGNAL(done ( )),this,TQ_SLOT(fspDone ()));
TQString mountPoint = TDEIO::findPathMountPoint( _path );
FreeSp->readDF(mountPoint);
do
diff --git a/src/k9settings.cpp b/src/k9settings.cpp
index e79c356..83fd37b 100644
--- a/src/k9settings.cpp
+++ b/src/k9settings.cpp
@@ -66,8 +66,8 @@ k9settings::k9settings(TQWidget *parent,const TQString &caption): KDialogBase (
grid->addWidget(m_prefAuthor,0,0);
- connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotOkClicked()));
- connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotApplyClicked()));
+ connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotOkClicked()));
+ connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotApplyClicked()));
}
void k9settings::slotOkClicked() {
diff --git a/src/kviewmpeg2.cpp b/src/kviewmpeg2.cpp
index 7f369a1..b0946dc 100644
--- a/src/kviewmpeg2.cpp
+++ b/src/kviewmpeg2.cpp
@@ -82,9 +82,9 @@ kViewMPEG2::kViewMPEG2() {
m_layout=NULL;
bPlay->setPixmap(SmallIcon("media-playback-start"));
bStop->setPixmap(SmallIcon("media-playback-stop"));
- connect(&m_player , TQT_SIGNAL(setPosition(uint32_t)), this, TQT_SLOT(setPosition(uint32_t)));
- connect(&m_player , TQT_SIGNAL(setMax(uint32_t)), this, TQT_SLOT(setMax(uint32_t)));
- connect(&m_player , TQT_SIGNAL(setMin(uint32_t)), this, TQT_SLOT(setMin(uint32_t)));
+ connect(&m_player , TQ_SIGNAL(setPosition(uint32_t)), this, TQ_SLOT(setPosition(uint32_t)));
+ connect(&m_player , TQ_SIGNAL(setMax(uint32_t)), this, TQ_SLOT(setMax(uint32_t)));
+ connect(&m_player , TQ_SIGNAL(setMin(uint32_t)), this, TQ_SLOT(setMin(uint32_t)));
lockSlider=false;
stopped=true;
@@ -103,7 +103,7 @@ kViewMPEG2::kViewMPEG2() {
}
m_player.getDecoder()->setUseGL(m_prefUseGL);
if (m_prefUseGL) {
- connect(m_player.getDecoder() , TQT_SIGNAL(ppmReady(uchar *,int,int,int)), this, TQT_SLOT(drawppm(uchar *,int,int,int)));
+ connect(m_player.getDecoder() , TQ_SIGNAL(ppmReady(uchar *,int,int,int)), this, TQ_SLOT(drawppm(uchar *,int,int,int)));
m_GLwidget= k9GLWidget::createWidget(label);
m_widget=NULL;
@@ -115,7 +115,7 @@ kViewMPEG2::kViewMPEG2() {
config.save();
} else {
- connect(m_player.getDecoder() , TQT_SIGNAL(pixmapReady(TQImage *)), this, TQT_SLOT(drawPixmap(TQImage *)));
+ connect(m_player.getDecoder() , TQ_SIGNAL(pixmapReady(TQImage *)), this, TQ_SLOT(drawPixmap(TQImage *)));
m_widget=new k9Widget(label);
m_layout->addWidget(m_widget,0,0);