Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit cf40f006901966bdf86163dbe5d1c7cb55f099ec)

2 files changed, 22 insertions, 22 deletions

diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index ed021225..04573545 100644
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@@ -36,7 +36,7 @@ Keduca::Keduca( TQWidget* parent, const char *name, WFlags f )
 	setXMLFile( "keducaui.rc" );
 	
 	_part = KParts::ComponentFactory::createPartInstanceFromLibrary< KParts::ReadOnlyPart >
-	        ( "libkeducapart", this, name, TQT_TQOBJECT(this), "KEducaPart" );
+	        ( "libkeducapart", this, name, this, "KEducaPart" );
 	
 	if ( _part )
 	{
@@ -63,12 +63,12 @@ Keduca::~Keduca()
 
 void Keduca::setupActions()
 {
-	KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() );
-	(void)new TDEAction(  i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ),
+	KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() );
+	(void)new TDEAction(  i18n( "Open &Gallery..." ), 0, 0, this, TQT_SLOT( slotGallery() ),
 actionCollection(), "open_gallery" );
-	_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &) ),
+	_recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &) ),
 actionCollection());
-	KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
+	KStdAction::quit(kapp, TQT_SLOT( quit() ), actionCollection());
 }
 
 void Keduca::slotFileOpen()
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index ca770008..d90fb876 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -92,8 +92,8 @@ void KEducaBuilder::init()
 
     _listAnswer = new TDEListBox( _split, "_listAnswer" );
     _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
-    connect( _listAnswer,  TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) );
-    connect( _listAnswer,  TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
+    connect( _listAnswer,  TQT_SIGNAL( highlighted(TQListBoxItem *) ), this, TQT_SLOT( slotPreview(TQListBoxItem *) ) );
+    connect( _listAnswer,  TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), this, TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
 
     _preview = new TQTextView( _split, "_preview" );
     _preview->setFrameShape( TQTextView::NoFrame );
@@ -111,21 +111,21 @@ void KEducaBuilder::init()
 /** Init menu bar settings */
 void KEducaBuilder::initMenuBar()
 {
-    KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenNew() ), actionCollection());
-    KStdAction::open   (TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection());
-    (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery");
-    _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection());
-    KStdAction::save   (TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), actionCollection());
-    KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection());
-    KStdAction::print  (TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint() ), actionCollection());
-    (void)new TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc");
-    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
-
-    (void)new TDEAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add");
-    (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit");
-    (void)new TDEAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove");
-    (void)new TDEAction(i18n("&Up"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up");
-    (void)new TDEAction(i18n("&Down"), "go-down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down");
+    KStdAction::openNew(this, TQT_SLOT( slotFileOpenNew() ), actionCollection());
+    KStdAction::open   (this, TQT_SLOT( slotFileOpen() ), actionCollection());
+    (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, this, TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery");
+    _recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection());
+    KStdAction::save   (this, TQT_SLOT( slotFileSave() ), actionCollection());
+    KStdAction::saveAs (this, TQT_SLOT( slotFileSaveAs() ), actionCollection());
+    KStdAction::print  (this, TQT_SLOT( slotFilePrint() ), actionCollection());
+    (void)new TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, this, TQT_SLOT( slotHeader() ), actionCollection(), "info_doc");
+    KStdAction::quit(this, TQT_SLOT( close() ), actionCollection());
+
+    (void)new TDEAction(i18n("&Add..."), "addquestion", 0, this, TQT_SLOT( slotAdd() ), actionCollection(), "question_add");
+    (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, this, TQT_SLOT( slotEdit() ), actionCollection(), "question_edit");
+    (void)new TDEAction(i18n("&Remove"), "delquestion", 0, this, TQT_SLOT( slotRemove() ), actionCollection(), "question_remove");
+    (void)new TDEAction(i18n("&Up"), "go-up", 0, this, TQT_SLOT( slotUp() ), actionCollection(), "question_up");
+    (void)new TDEAction(i18n("&Down"), "go-down", 0, this, TQT_SLOT( slotDown() ), actionCollection(), "question_down");
 }
 
 /** Delete current document and start new */