Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 22 insertions, 22 deletions

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;");