Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

k9Mplayer/k9mplayer.cpp

@@ -23,7 +23,7 @@ K9Mplayer::K9Mplayer(TQObject  *parent,const char *name,const TQStringList args)
     m_initVol=TRUE;
     m_title=0;
 
-    m_process=new TDEProcess(TQT_TQOBJECT(this));
+    m_process=new TDEProcess(this);
     m_ratio=4.0/3.0;
 
     slider->setRange(0, 100);

libk9copy/k9processlist.cpp

@@ -148,7 +148,7 @@ void k9ProcessList::setPos(k9Process *_process,double _pos) {
 
 k9Process *k9ProcessList::addProcess(const TQString &label) {
     TQString name=TQString("process%1").arg(m_items.count()) ;
-    k9Process *process=new k9Process(TQT_TQOBJECT(this),name.latin1());
+    k9Process *process=new k9Process(this,name.latin1());
     m_processes.append(process);
     TQListViewItem *item = new _k9ProcessListItem(lProcess,label);
     m_items[process]=item;

libk9copy/k9progress.cpp

@@ -26,7 +26,7 @@
 
 k9Progress::k9Progress(TQWidget* parent, const char* name,const TQStringList &args)
         : Progress(parent,name,0) {
-    m_process=new k9Process(TQT_TQOBJECT(this),0);
+    m_process=new k9Process(this,0);
     m_wimage=new k9DrawImage(image,0);
     TQGridLayout *l=new TQGridLayout(image,1,1);
     l->addWidget(m_wimage,0,0);

src/k9copy.cpp

@@ -122,7 +122,7 @@ void k9Copy::createCopyWindows() {
     m_ToolViews.append(acc);
 
     if (m_useXine) {
-        m_mp2=new K9Mplayer(TQT_TQOBJECT(this));
+        m_mp2=new K9Mplayer(this);
     } else
         m_mp2=new kViewMPEG2();
 
@@ -251,18 +251,18 @@ bool k9Copy::queryClose   (    ) {
 
 void k9Copy::setupActions() {
 
-    m_actions["open"]=KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
+    m_actions["open"]=KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-    m_actions["quit"]=KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
+    m_actions["quit"]=KStdAction::quit(this, TQT_SLOT(quit()), actionCollection());
-    m_actions["preferences"]=KStdAction::preferences(TQT_TQOBJECT(this),TQT_SLOT(preferences()),actionCollection());
+    m_actions["preferences"]=KStdAction::preferences(this,TQT_SLOT(preferences()),actionCollection());
-    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 
 
     setStandardToolBarMenuEnabled(TRUE);
     createStandardStatusBarAction();
 
     PlayTitleAction = new TDEAction(i18n("Play title"), 0,
-                                  TQT_TQOBJECT(this), TQT_SLOT(ActionPlayTitle()),
+                                  this, TQT_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,
-                             TQT_TQOBJECT(this), TQT_SLOT(ActionCopy()),
+                             this, TQT_SLOT(ActionCopy()),
                              actionCollection(), "Copy");
     m_actions["copy"]=CopyAction;
     CopyAction->setIcon("dvdcopy");
 
 
     mkMpeg2Action = new TDEAction(i18n("Extract MPEG2"),0,
-                              TQT_TQOBJECT(this), TQT_SLOT(ActionMpeg2()),
+                              this, TQT_SLOT(ActionMpeg2()),
                               actionCollection(),"MakeMPEG2");
     m_actions["mp2"]=mkMpeg2Action;
 
     mkMpeg2Action->setIcon("mpeg");
 
     mkMP4Action = new TDEAction(i18n("Create MPEG-4"),0,
-                              TQT_TQOBJECT(this), TQT_SLOT(ActionMP4()),
+                              this, TQT_SLOT(ActionMP4()),
                               actionCollection(),"MakeMPEG4");
     m_actions["mp4"]=mkMP4Action;
 
     mkMP4Action->setIcon("mp4");
 
     ejectAction = new TDEAction(i18n("Eject"),0,
-                              TQT_TQOBJECT(this), TQT_SLOT(ActionEject()),
+                              this, TQT_SLOT(ActionEject()),
                               actionCollection() , "Eject");
     ejectAction->setIcon("player_eject");
 
@@ -300,19 +300,19 @@ void k9Copy::setupActions() {
 
     
     backupAction= new TDERadioAction(i18n("DVD Backup"),0,
-                              TQT_TQOBJECT(this), TQT_SLOT(ActionBackup()),
+                              this, TQT_SLOT(ActionBackup()),
                               actionCollection(), "backup");
     backupAction->setExclusiveGroup("mode");
     m_actions["backup"]=backupAction;
 
     authorAction= new TDERadioAction(i18n("DVD Author"),0,
-                              TQT_TQOBJECT(this), TQT_SLOT(ActionAuthor()),
+                              this, TQT_SLOT(ActionAuthor()),
                               actionCollection(), "author");
     authorAction->setExclusiveGroup("mode");
     m_actions["author"]=authorAction;
 
     m_actions["create"]= new TDEAction(i18n("Create DVD"),0,
-                              TQT_TQOBJECT(this), TQT_SLOT(ActionCreate()),
+                              this, TQT_SLOT(ActionCreate()),
                               actionCollection(), "Create");
     m_actions["create"]->setIcon("author");
 
@@ -393,7 +393,7 @@ void k9Copy::preferences() {
         m_ToolViews.removeRef(m_previewAcc);
 
         if (m_useXine)
-            m_mp2=new K9Mplayer(TQT_TQOBJECT(this));
+            m_mp2=new K9Mplayer(this);
         else
             m_mp2=new kViewMPEG2();
         m_previewAcc=addToolWindow(m_mp2,KDockWidget::DockRight,getMainDockWidget(),0,i18n("Preview"),i18n("Preview"));

src/k9main.cpp

@@ -102,7 +102,7 @@ k9Main::k9Main(TQWidget* parent, const char* name, k9CdDrives *_drives)
   }
   */
 
-  dvd=new k9DVD(TQT_TQOBJECT(this));
+  dvd=new k9DVD(this);
 
   updating=false;
 
@@ -117,7 +117,7 @@ k9Main::k9Main(TQWidget* parent, const char* name, k9CdDrives *_drives)
   bInputOpen->setPixmap(SmallIcon("document-open"));
   bInputOpenDir->setPixmap(SmallIcon("folder_open"));
   emit SelectionChanged(NULL,true);
-  m_update=new k9UpdateFactor(TQT_TQOBJECT(this),"");
+  m_update=new k9UpdateFactor(this,"");
   connect(m_update,TQT_SIGNAL(updateFactor_internal()),this,TQT_SLOT(updateFactor_internal()));  
 }
 
@@ -594,7 +594,7 @@ void k9Main::Open()
 void k9Main::setDVDSize()
 {
   //k9DVDSize *dvdsize=static_cast<k9DVDSize  *>(m_factory->create(this,"dvd", "k9DVDSize"));
-  k9DVDSize *dvdsize=new k9DVDSize(TQT_TQOBJECT(this));
+  k9DVDSize *dvdsize=new k9DVDSize(this);
   dvdsize->setMaxSizeDyn(m_prefSize);
   delete dvdsize;
 }