Replace various '#define' strings - part 6

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

10 files changed, 34 insertions, 34 deletions

diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index 4745e1f..1a3820c 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -118,7 +118,7 @@ AlsaPlayer::AlsaPlayer()
 
 	connect
 		(
-		 new AlsaPlayerConfigModule(TQT_TQOBJECT(this)),
+		 new AlsaPlayerConfigModule(this),
 		 TQT_SIGNAL(saved()),
 		 TQT_SLOT(slotConfigChanged())
 		);
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index f673fb1..a896cfa 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -189,7 +189,7 @@ Charlatan::Charlatan()
 
 	connect
 		(
-		 new CharlatanConfigModule(TQT_TQOBJECT(this)),
+		 new CharlatanConfigModule(this),
 		 TQT_SIGNAL(saved()),
 		 TQT_SLOT(slotConfigChanged())
 		);
diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp
index 4107afd..c964979 100644
--- a/noatun-plugins/dub/dub/dubapp.cpp
+++ b/noatun-plugins/dub/dub/dubapp.cpp
@@ -54,7 +54,7 @@ DubApp::~DubApp()
 
 void DubApp::initActions()
 {
-  fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+  fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection());
   setStandardToolBarMenuEnabled(true);
   createStandardStatusBarAction();
 
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 2a955b4..56f64a6 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -58,10 +58,10 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
   boxlayout->addWidget(providersBox);
 
   boxButtons = new KButtonBox( this,TQt::Vertical );
-  boxButtons->addButton( i18n( "New Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( newSearch() ) );
-  boxButtons->addButton( i18n( "Delete Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( delSearch() ) );
-  boxButtons->addButton( i18n( "Move Up" ), TQT_TQOBJECT(this), TQT_SLOT( moveUpSearch() ) );
-  boxButtons->addButton( i18n( "Move Down" ), TQT_TQOBJECT(this), TQT_SLOT( moveDownSearch() ) );
+  boxButtons->addButton( i18n( "New Search Provider" ), this, TQT_SLOT( newSearch() ) );
+  boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQT_SLOT( delSearch() ) );
+  boxButtons->addButton( i18n( "Move Up" ), this, TQT_SLOT( moveUpSearch() ) );
+  boxButtons->addButton( i18n( "Move Down" ), this, TQT_SLOT( moveDownSearch() ) );
   boxButtons->layout();
   boxlayout->addWidget( boxButtons );
 
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index ad65194..4a552eb 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -27,28 +27,28 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false)
 {
   lyrics = this;
   /* Create default actions */
-  (void)KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-  ( void )KStdAction::goTo( TQT_TQOBJECT(this), TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" );
-  //(void)KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
-  //(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection());
-  //(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection());
-  //(void)KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
+  (void)KStdAction::close(this, TQT_SLOT(close()), actionCollection());
+  ( void )KStdAction::goTo( this, TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" );
+  //(void)KStdAction::print(this, TQT_SLOT(print()), actionCollection());
+  //(void)KStdAction::printPreview(this, TQT_SLOT(printPreview()), actionCollection());
+  //(void)KStdAction::mail(this, TQT_SLOT(mail()), actionCollection());
+  //(void)KStdAction::find(this, TQT_SLOT(find()), actionCollection());
   follow_act = new TDEToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow");
-  KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection());
+  KStdAction::redisplay(this, TQT_SLOT(viewLyrics()), actionCollection());
   attach_act = new TDEToggleAction(i18n("&Link URL to File"), "attach", TDEShortcut("CTRL+ALT+A"), actionCollection(), "attach_url");
   connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool)));
-  back_act = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection());
+  back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection());
   back_act->setEnabled(false);
-  forward_act = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection());
+  forward_act = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection());
   forward_act->setEnabled(false);
   new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "tde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label");
-  site_act = new TDESelectAction(i18n("&Search Provider"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider");
+  site_act = new TDESelectAction(i18n("&Search Provider"), 0, this, TQT_SLOT(viewLyrics()), actionCollection(), "search_provider");
 
   /* Add entry to menu */
-  menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()));
+  menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics()));
 
   /* Create history manager and htmlpart */
-  history = new HistoryManager(TQT_TQOBJECT(this));
+  history = new HistoryManager(this);
 	htmlpart = new TDEHTMLPart(this);
 	//htmlpart->view()->setMinimumSize(350, 420);
 
@@ -73,7 +73,7 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false)
   config->setGroup("Lyrics");
   follow_act->setChecked(config->readBoolEntry("follow", true));
   /* Create config object */
-  new LyricsCModule(TQT_TQOBJECT(this));
+  new LyricsCModule(this);
   
 }
 
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index b3bf45f..f7f8448 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -355,7 +355,7 @@ void SchemaConfig::editValueRegexp()
 	{
 		mRegexpEditor =
 			KParts::ComponentFactory::createInstanceFromQuery<TQDialog>(
-					"KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this)
+					"KRegExpEditor/KRegExpEditor", TQString(), this
 				);
 	}
 
diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp
index 84a46c8..cbf67c3 100644
--- a/noatun-plugins/oblique/menu.cpp
+++ b/noatun-plugins/oblique/menu.cpp
@@ -20,8 +20,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file)
 
 	(new SliceListAction(
 			i18n("&Slices"), oblique,
-			TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)),
-			mFiles, TQT_TQOBJECT(this)
+			this, TQT_SLOT(toggleInSlice(Slice *)),
+			mFiles, this
 		))->plug(this);
 }
 
@@ -52,8 +52,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items)
 
 	(new SliceListAction(
 			i18n("&Slices"), oblique,
-			TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)),
-			mFiles,TQT_TQOBJECT(this)
+			this, TQT_SLOT(toggleInSlice(Slice *)),
+			mFiles,this
 		))->plug(this);
 }
 
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index d2d0a87..32210cd 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -42,9 +42,9 @@ View::View(Oblique *oblique)
 	setCentralWidget(mTabs);
 
 	TDEAction *ac;
-	ac = new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
+	ac = new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files");
 	ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection."));
-	ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
+	ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
 	
 	
 //	ac = new TDEAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload");
@@ -52,22 +52,22 @@ View::View(Oblique *oblique)
 
 	ac = new SliceListAction(
 			i18n("&Slices"), oblique,
-			TQT_TQOBJECT(this), TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices"
+			this, TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices"
 		);
 	ac->setWhatsThis(i18n("Select a sub-collection to display"));
 
 	mSchemaListAction = new SchemaListAction(
-			i18n("&Schemas"), TQT_TQOBJECT(this), TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas"
+			i18n("&Schemas"), this, TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas"
 		);
 	mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree."));
 
 	ac = new TDEAction(
-			i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT(addTab()),
+			i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()),
 			actionCollection(), "newtab"
 		);
 
 	mRemoveTabAction = new TDEAction(
-			i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(removeTab()),
+			i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()),
 			actionCollection(), "removecurrenttab"
 		);
 
@@ -87,7 +87,7 @@ View::View(Oblique *oblique)
 		connect(jumpAction->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&)));
 	}
 
-	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
+	KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection());
 
 	applyMainWindowSettings(TDEGlobal::config(), "Oblique View");
 	createGUI("obliqueui.rc");
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
index 54527bf..3b67678 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
@@ -149,7 +149,7 @@ void PitchableSpeed::preserveFrequenciesChanged(bool preserveNow)
 void PitchableSpeed::init()
 {
 	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Speed Slider"),
-										 TQT_TQOBJECT(this), TQT_SLOT(toggle(void)));
+										 this, TQT_SLOT(toggle(void)));
 }
 
 void PitchableSpeed::toggle(void)
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index a95658b..aadc8c8 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -55,7 +55,7 @@ SynaeScope::~SynaeScope()
 void SynaeScope::init()
 {
 	connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(read(TDEProcess *, char *, int)));
-	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void)));
+	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQT_SLOT(toggle(void)));
 
 	process << TDEStandardDirs::findExe("noatuntippecanoe.bin");